I don't have any fresh ideas because honestly I think you're going the right way about it, but just adding some support because this is a tough transition! I think it's pretty much impossible to avoid some OT and long days, and I found it really annoying switching between 1 nap, 2 naps, short naps, long naps, but that's what it took here. I know some people go to one nap cold turkey (I would've loved to!) but most babies just can't handle that.
With the 5am wake ups I personally would've done 2 longer naps again just to catch up until you feel that he's no longer OT (maybe a couple of days) and then push out and cap the morning one again so that you don't encourage the EW.
I think this is such a tough one because there's so much going on at this age besides changing sleep needs. I remember during the 2-1 dd was also teething, started standing, started walking, and pretty much turned from a baby into a toddler. The developmental leaps were crazy and can mess with sleep at the best of times, let alone when it's getting messy anyway. There's only so much you can do, and I think you're doing great! It might not feel like it, but things will settle down and this will be a bad memory
![Smiley :)](https://smiley.babywhispererforums.com/Smileys/classic/smiley.gif)