This is his new schedule:
730 - wake (which is an improvement)
830 - breakfast
1100 - lunch
1200 - nap
215 - wake (he has done this on his own)
315 - snack
600 - dinner
645 - bath
730 - bedtime (he hasn't fallen asleep at bedtime but has been sleepy enough not to bounce around...he is usually asleep 5 to 15 minutes after laying down)
But still...
300 a.m. - awake, bouncing, playing - no matter if we feed him, or nit, he's up for at least an hour, if not two, at a time.
So early waking is solved but the night time waking are still occurring and have been for a good 6 weeks now. Once per week he will sleep though, if we're lucky.
Last night was another two hour waking. We were both so exhausted we just let him play. He eventually went back to sleep. He doesn't act any different when this happens, meaning he is not traumatized by it. Quite the opposite actually: he loves being able to play and then goes back to sleep.