M.H.
Sounds like a good routine. My son is 19 months and in a big boy bed so we're struggling again with bedtime but we got into a really good routine with him in his crib, he has super dry skin so we didn't do baths every night so we'd just go in his room, turn off lights then on his music, then read and snuggle and lay him down when he drowsy but awake. Some nights he would fuss, others he would play, but he always slept so much better then if we put him down already asleep. While I was nursing some nights he would fall asleep nursing so I did try to do that before we went into his room and if he needed a little snack I'd give him a little more then read a book before putting him down so it wasn't the last thing we did. Good luck!