Thank you so much for your reply. ☺
That's pretty much how I've been dealing with it so far, I just wanted to confirm I wasn't messing something up because the book didn't specify.
Basically after the CN it's bath (or wipe down on non bath nights)/massage first because I find this stimulates him instead of relaxing him, fresh diaper, feed, then depending on how close it is to BT we either do quiet activity time just chatting and cuddling, and then wind down and bed. If it's too close to bed time I skip the quiet activity time but I always make sure to take 10-15 minutes to wind down so he doesn't eat to sleep.