S.H.
its a phase. This happens sometimes in kids.
Just keep to a routine for naps/bedtime.
If you change up the nap/bedtimes TOO much... it will make it worse.
When he wakes at 5:30, if he is not screaming/crying, just let him be. He might go back to sleep or play in his crib. My son used to do that. He was fine, without my interference. THEN when he did want OUT of the crib... he'd actually "call" me.