Well that's a great update!
There's no need to hurry towards one nap, lots of LOs do still need 2. I've seen routines where the short nap is reduce a little each time the routine goes off track with nap ro BT resistance, just reducing by 5 or 10 mins each time then holding there until there next tweak is needed. Eventually LO is having just a little 10 min nap for a while before it's dropped. Sounds to me like a pleasant way to move towards the nap drop, not at all like my DS! ha!
Hope the nights continue to be good for you.