You are not alone- the 2-1 nap switch took SO LONG for us!! Ups and downs- long naps/short naps, EWs, ugh.
The good news is, it WILL happen! I honestly wound up taking things day by day- some days he was able to go till noon and slept for 1 hour- YIKES, therefore early to bed.
Next day, needed AM and PM naps- but refused the PM nap- so OT and early to bed, Next day, took both solid AM/PM naps so, later bedtime!
Drove me batty- huge hugs...
Honestly, the naps will be wonky for a while, then once he starts to settle down for one 12:30 ish nap, it will gradually lengthen to a nice 2 hour nap!
Hang in there!