Naps or no naps?

My almost 4 year old son really stopped taking naps months ago- he could use a nap, but I am not in to him staying awake until 11:00 pm. If he does not take a nap, he is usually in bed at 8:00 pm, if not earlier. While I was in Las Vegas for a week, he got used to getting up when his daddy got up, at 6:00 am! Not my usual wake up time... so it has been killing me for the last few weeks, and him, since he is exhausted by 5:30 pm, too early for bed. So two nights ago, he went to sleep at 7:00 pm and woke up at 8:45 pm ready to go. He actually took a nap at 7:00 in the evening! And of course, who stayed up with him... ME! The next day, he got up early again, but this time I made him nap at 1:00 pm. He and his sister played for 1 hour before they both fell asleep. I let him sleep an hour (waking him up is a whole other story) and got him up. So he went to bed at 9:30 pm last night. It is such a hard choice to nap or not nap... peace in the evening because he is rested or an early bed time. I guess we will see how this continues to play out, and if I am the one that has to change and get up early!