you might want to start taking out naps all together. When my son and daughter were this age, I had to stop naps all together. My son would stay up until 1 am and still get up at the same time, around 6:30am, every morning. My daughter would either stay up late as well, or get up at the crack of dawn. Once the naps were stopped, they went to bed at a good time. The only time my now 3 yr old daughter gets a nap is if she walks up to me and says, im tired, im taking a nap. Then I try to limit it to 20 mins tops, which she usually gets herself up at anyways. Good Luck!!