Pick him up and comfort him if that is what you want to do. There is no such thing as a bad habit when it comes to lthe ove and comfort of your baby. I agree with what the others have said - the only question I have is with the night feed do you stimulate him at all. I always changed and feed Mackenzie with just a night light on and didn't speak to her but did look at her lovingly and smiled at her. I was blessed with a baby who could feed while she was asleep and then I'd pop her back in her cot. This is my only advice which you could try if you aren't doing it already.