Sounds very much like she's in the 2-1 transition
I hated this point and although it may not have been the right thing to do, I decided we were going to push on with one set nap and very early BT, the only exception being if we had a pre-6am waking where I would allow a short morning nap and then try for a half-decent afternoon one. Possibly we could have held onto two naps for longer if I'd switched to a short am, long pm routine, but we also had the fact she was about to start at nursery where they only offered one nap.
Our routine was:
WU whenever
Nap 11.15/11.30 up to 3h if she wanted - rarely got there in the first month or two!!
BT 5.30/6pm
If there was a very EW we did a 20 min nap around 9/9.30 and then a pm nap around 3h later.
I won't lie, it was tough for a few weeks and we had quite a lot of night wakings, but I just reached the point where I couldn't be bothered to work it out any more! But it's worth considering a short am, long pm routine as that would likely be a bit gentler on LO. You could post over on the 2-1 transition support thread for some advice on that?