Yes, us too on the no nap / short nap day. Definitely had several occasions where a nap actually made things worse. Early bedtime always fixed things better for us when short a times started being a problem... If your LO handled 2-1 well you might find he surprises you and copes better than you think and 30 minute naps have saved us a few times if you think he needs something.
Also, it might be worth picking a routine you think will work (one for nap days and a rule which says if he's not asleep by x time he's obviously not tired enough to nap and do ebt instead), and then stick to it for a food few days. I'm a terrible one for tweaking and have realised recently that if I pick a routine and stick to it, it gives Lily the chance to work her way through any issues and sort herself out. Even if there's no improvement for a couple of days.... It's really hard to do, but I normally end up writing off one day, thinking I can't possibly make things worse and pushing her a bit, just to set the scene for a new routine. She often surprises me when I do.
It's tough though, I really feel for you. X