J.H.
Sounds like the teething sort of started it all, and I gave my daughter a pacifyer when she first started to cry, as I didn't think she was hungry, and she would go back to sleep. You may have to hold it a second and pat him, but hopefully soon the habit of waking up will stop. You also may try putting him to bed 30 minutes later, and feed him rice cereal in his last feeding. This also did the trick for my daughter. She then slept until 5:30 or so. I know you'd love for him to sleep until 7, but if he doen't wake up in the middle of the night anymore, it still seems like all night when they go to bed that early. My daughter didn't go to sleep at night that early, but they are all so different. Hope the cereal and pacifyer helps you. I only ussed the pacifyer, when I thought she wasn't really hungry and her diaper was dry, I wasn't one for just sticking it in their mouth and it being a fixture. Hope this helps.