When he wanes up to eat try to get him to finish a full bottle instead of just drinking for a couple mins
Take his clothes off to keep him awake, take a blanket off of him, he is just too comfortable and needs to eat longer.
make sure he gets a good full belly at the last feeding before you want to go to bed, swaddle him, rock him to sleep and put him to bed. Sleeping on you, he isn't likely to be getting into a deep sleep, and he can smell you and the milk, of course he wants it. If you have to rouse him to get him to eat more, do it. He's not getting full.