Honestly Hun, IIWM I would stick with the routine for at least a week but probably more. Can I ask what is his personality:
The BW "Know Your Baby Quiz"I am wondering if he is quite Touchy, and the consistency would serve him well. It seems he needs a chance to reset his clock. Also something to think about is that for some LO's a longer am will over ride a shorter pm, so if you stretch the morning further, he can still have his normal nap but may go down at the same time even though a later wake up.
As he suffers from EW and NW when OT, I think to stick with the 2 hour nap unless you're convinced it isn't working, as it sounds like he could be a LO who needs his sleep spread between a decent nap with a shorter night
.
All if this ^ is just my gut feeling Hun, correct me if I'm wrong, as it's your gut feelings that truly count as you know him best
(Hugs)
x.