Oh dear
Hugs for the nw and grumpy LO.
Just wrote a reply and saw that jessmum has posted in the meantime so I'll dovetail my reply with hers.
I agree that you might need to cap further to get past this point. Jack often hits an awkward stage where he's OT but still napping too long to get a decent night, so things get worse cos he's getting less sleep but is never up for long enough to build up enough tiredness to crash. We've fixed it both ways - by getting over the OT by reducing A times and then pushing them quite quickly after that to find the right routine, or by pushing jack further and letting him crash. If your LO is susceptible to OT though then yes, you might want to catch her up rather than push her further.
The other thing is that some LOs just don't suit nap capping and for those I think you just have to move BT later and accept the short nights. I know some BWs have found that instead of capping the nap further and further it works better for their LO to have a big nap and, when they start dropping the nap, do EBT on nnds and a later BT the rest of the time. Just something else to consider if you're finding nap capping hard on you both.