We don't do ours exactly the same, but with similar things:
Naptime routine - sits on my lap facing outwards, gets his dummy, plays with my fingers, I stroke his head, bounce a bit, have a little chat (pretty one sided, but these days a little more participation from DS!). Only a few minutes of that, then we get the 'naptime book' out - we have one cloth pastel coloured story book (counting animals) so it's not noisy and bright to get him stimulated. We look through it, he likes to pull at things, etc. When the book is done and we've played with it and he's had enough, I put it aside and continue sitting. I start humming usually and occassionally do a little bounce. When he is ready (in our case a yawn or eye rubbing), swaddle and carry up to bed.
Bedtime routine - bath, pjs, and bottle. When feeding is done he sits on my/DH's lap and everything is the same, but we don't do the book. The book is for naps only (which took DH about a month to remember). But we sit like that and hum and chat quietly and let DS play with our fingers, etc. Then take up when he's ready to go.
Does that help at all?