Could you try feeding more frequently during the day if he is going longer stretches then? Try and reverse it a little? I don't really know the secret though, my DD was waking 2-3hrly right up till her 2nd birthday haha.

hope you can catch up on sleep soon.