G#1 has always been an early riser and we spent months working to get him to sleep until 6:15. He would wake at 4:30 or 5. We would go in, lay him back down and say "it's still night-night time" and leave. We would go back and repeat every 15 minutes or so and then at 6:15 we would make a big deal about it being morning, throwing on the lights, opening the curtains, etc
He's also always been a rough napper, but we've done ok over the past 6 months by making sure we're at the house by 11 so that we can start quieting down and have lunch early enough.
Now, he's started waking at 5 again. At first it was because of new baby noise, but now it happens even when the baby is quiet. We have a toddler alarm clock and our basic routine is, when Gavin screams at 5, we go in and tell him that it's still night-night time and that he can get up when the light turns green. Then he screams for the next hour and we go in periodically, lay him down, say it's still night-night time and that he can get up when the light turns green. At 6:15 we go in, make a big deal about the light being green and about it being morning.
He's also started to refuse naps both at home and at school. So, he's sleeping from about 7:30-5 and not napping. I think we've got an overtired child on our hands (and he acts it in the evenings). I feel like the nap thing might naturally sort itself out if we get him sleeping better at night. I could be wrong.
So, WWND? Persist as we have been or try something different? I have a couple ideas. Maybe a sticker chart and he gets a sticker for being quiet until the light turns green? Or, if he waits quietly for the light to turn green he can watch a show before school? Or maybe his whole sleep routine is jacked and we need to try a new bedtime?

Re: We've got a bit of a sleep issue
Bedtime routine is bath, pjs, brush teeth then 3 books. We lay him down, turn on the seahorse and then walk away and he puts himself to sleep. He's still in a crib, so he can't get up and get something to play quietly with, but really the goal is for him to sleep a bit more
~Working Mom~Breastfeeding Mom~Cloth Diapering Mom~BLW Mom~
Blog - No Longer on the DL ~ The Man Cave
Shawn and Larissa
LO #1 - Took 2 years and 2 IVFs ~ DX - severe MFI mild PCOS homozygous MTHFR (a1298c)
LO #2 - TTC 7 months, surprise spontaneous BFP!
If he's overtired, I'd try for a bedtime of 7 for a few nights and hope that gets you back on track.
The sticker chart may work as well. OR even a mommy will make pancakes for you if you are quiet until you see the green light. Or something similar.
Yeah, I think trying a sticker chart is a good idea. Maybe go to Target and pick out a toy (so he can see it, that made a difference for O), but it and say he can have it when he gets X stickers.
I'd probably go in like you've been doing and add "oh, bummer no sticker today!"