Aww I'm sorry I missed this hun, I had the page open ready to reply before I left early this morning and somehow forgot to press send.
That was a fab night, I bet he was in a better mood this morning? Even though he is still waking for the day early (before 6am) he has still had 11.5hours sleep - all we need to do now is get the timing of the nap right then slowly everything forward a little until you are on a bit more sensible 7-7 day or whatever suits you.
Shame he didn't nap too long :-( I agree it was a long A - ideally that may be when you want your nap to start but not until he's waking a little later and can manage such a long morning! What happened when he woke? You should start leaving him 20mins when he wakes from each nap so that he knows it was a little early. After a few tries he may surprise you and go back to sleep. Does he have the fan on for his nap too to help him transition back over when he stirs after his hour?
I would say put him to bedtime about 5.50-5.5.55 aiming to have him sleeping by 6pm. You need to keep these early bedtimes until he is napping well and the OT is gone. I hope tonight is a good night too x