tried for 1.5 A right after CN bc he was yawning and fussy. I did his bath and bedtime routine which took 1/2 hr...he woke up 35 minutes later. Do you think his A May have been too long or too short?
This jumped out at me. If you started bath and bedtime routine after he yawned, he was likely OT by the time you got him to bed. If he's yawning, I would skip the bath and get him straight to bed.
When A times are changing I generally just watch for sleep cues and do the next nap whenever LO yawns. DS often surprised me by being able to do a nearly full A time after a short nap.
Like many things, it's hard to say if he'd need a full A after a full nap instead of a CN. My DD would have needed more A whereas DS would have just gone down at his normal time. If he had a full nap because his earlier naps were shorter he was probably catching up a bit and may still go down after a shorter A time. I would just watch for cues and be ready to get him to bed as soon as he yawns.
How are you doing with WU? Are you moving it earlier?