Hmm... I don't know what advice to give about the crying at night. Have you spoken to his doctor? I don't think it's because he's scared. Did you by any chance recently move him into his own room? Can you think of any changes that happened recently?
As for the time shift, it could have been caused by any number of things though you probably shouldn't have just left it alone to fix itself (it rarely does). :wink:
He may be ready for a switch to 2 naps per day. Also, if 5 AM is too early (which I would say it is) maybe you can move his bedtime just a little bit later, at 7:30. Also, the switch to 2 naps per day should lengthen his nighttime sleep.
After you wake up, do you do anything else or go straight to bed? I know when my DS was an infant and I was waking up to feed him and then pumping, I would be awake for at least an hour and a half if not 2 hours. But, to be honest, I would log onto this site while pumping. :oops: I finally decided that I had to stop that because it was making me more awake. I slept a lot better.