It all looks like 2-1 to me I'm afraid now, this is just par for the course when transitioning. If he'll sleep in late I'd shoot for one nap 4-4.5h after WU, we did a set time of 11.30 when we hit this point with set BT 6pm (-30mins if nap a disaster). On EW days you could allow a short CN around 9/9.30am (15-20 mins) then a second nap after 3-3.5h. I never woke in the morning during nap transitions and I think you're right not to. Until you can manage a consistent long nap there does have to be some element of 'go with the flow', at least that's what I found x