it's probably too late now for you....sorry....just put Abby down and popped on to check. With the catnap, I'd only try for maybe 30 min and if it's a no-go, then it's early bedtime. But I'd say to limit his early bedtime to 6:45/7 - again, I'm wondering if the early bedtime is contributing to the EW (because he's had 12 hrs and he's done). Going through the transition to 1 nap can be really awful. We had days where Abby would have 30 min of naps all day. And even on those days, I didn't put her down earlier than 6:45 (honestly, I was too afraid she'd wake up at 5 and be ready for the day - I'd rather deal with super clingy crabby OT baby before bed than wide awake at 5!)
I find that shh/pat makes it worse at this age. We do wi/wo - and I've done it for 3+ hours at night a few times (that's really awful!). For naps, I would probably only try it for 30 min, then call that nap a wash and try for a better afternoon nap (if it was a morning bust nap) or do early bedtime (if it was an afternoon bust nap).
If his am wake up time varies a lot, I"m guessing w2s will be a bit more of a challenge then, and also that seems more likely that it's not a habit but due to the early bedtimes. That being said, you may want to keep trying it if naps are bad and bedtime is early - though I'd try to push out bedtime a bit and see if that helps any.
He's so OT at this point, I'm not sure you'll see any quick change, I'd say pick a plan and stick to it for 3-5 days and see if the OT will sort out. Definitely try for 2 nap days - does he seem to prefer the am or the pm nap or neither? I'd say if it's neither, go with a longer am nap (if you can) because you can always try to make up for it in the pm if it's bad; but if you limit the am nap and the pm one is bad too, then it's just all bad. So try for around 4ish hrs of A time in the am if you think he can handle it.
hang in there!!! You may want to check out this thread just for some additional support from moms who are there right now (not that I'm leaving you -- I'm not!):
http://babywhispererforums.com/index.php?topic=129650.0{{{{{{{{hugs}}}}}}} and vibes for a good night!!!!