bedtime routine!

Help! LO is 9 months. He has been pretty good about sleeping thru the night. What is your bedtime routine? Lately he has been waking up about 2 to 3 times during the night. Last night he woke up around midnight but I didn't go running to him. He fussed and fell back asleep. He then woke up around 4:30 am and was screaming! I got up and changed his diaper which was full. Every time I put him in bed he would scream. He was fine cuddling. My husband ended up cuddling him to sleep and slept the remainder of the morning in his room. I want to make sure we aren't creating bad sleeping habits and trying to figure out what I can do to help him sleep thru the night again. For bedtime we start about 8pm and we do bathtime then jammies and then bottle and he usually gets drowsy or falls asleep. Should I be doing bottle before cuddle time? Even when he was sleeping thru the night he wouldn't sleep past 6am which I wish he would. Any input or suggestions would be great!!