I would start the day from 7 just because it's a better time to start the day! Even though he didnt sleep much after 5 he was still in bed, still resting and not out playing.
I'm not sure about the 5am wake up other than it's a common time to stir, and some LOs have a harder time going back off. Is there anything you think might be disturbing him like he's too hot or cold, teeth (again!), light in the room, etc? Also have you tried W2S?