Just following along and letting you know you're not alone. My DS will b3 20 months in two weeks, and has been waking up at 5:30 for the past few weeks too. Like yours, he used to sleep until 6:30/7am, and we are doing naps at 12:30 as well, although my DS won't sleep anymore than 2 hours. BT is 6:30/7 and he has no trouble falling asleep. He is cutting his canines though, so I'm hoping the EWings are due to that. Is your DS teething at all? Not sure a Gro-clock would work at this age... my son definitely wouldn't understand the concept, but maybe in a few months?? Hope your mornings get better soon. Any chance your DH could try showering at a different time a couple days to see if it made a difference?