I think it had more to do with how you are responding in the middle of the night, rather than what you are doing to calm the baby before bed.
I am assuming that the baby has a schedule during the day. Maybe a nao from 10-11 and another from 2-3?? Assuming that is teh case, I woudl suggest bedtime of 7-7:30 after bath, books, etc. During the night, let the baby cry unless he is really worked up. He needs to learn to self-soothe. If he does get really worked up, go in, DO NOT PICK HIM UP, and rub his back or touch him gently until he calms down and then leave. I would do this consistently until he gets the message that you are there for him, but it's not time to get up. It's time to rest. This is actually something that should have been addressed around 4 months so you will have a little bit of trouble introducing something new at this age. I woudl make sure not to get him up in the morning until 6:30, at least.