My 2.4 ds used to be easy to put to bed and woke up at 6.30am. Since dropping his nap (1.5hrs) he's a nightmare to put to bed and wakes at 5.15. Does this settle down?