My 2,4 ds has dropped his nap. He used to be easy to put to bed and wake at 6.30, Now he wakes at 5,15 and is a nightmare to put to bed. Anyone else find this? Does it improve?