M.,
Our 2.5 year old was having some crabby issues in the morning and was crying when I dropped him at daycare. Finally, we changed bedtime from 8:30 to 8:00 and it worked. We now start the bedtime routine (teeth, reading, bed) at 7:30 and it works really well (most of the time). He wakes up on his own at about 7:00 and will play in his room for a little bit.
The other night, he stayed awake in his bed until almost 9 and still woke up at 7, but was a CRAB! Difficult, moaning, argh. I think an earlier bed time would be a good idea for you.
As for the nap, our son naps from 12:15 - 2:15 everyday. I noticed it's getting to be a little less this week (by 20 minutes or so).
Hope that helps.