You really don't have to resign yourself to them forever, even if her routine hasn't quite stabalised yet as long as she is no longer OT you could gently push her day on, but I would do it very GENTLY like 5-10mins every 4 days or so.
That said she does seem to be getting slightly more regular in routine, I'm pretty sure as she continues to grow into 1 nap things should pretty much sort themselves out, regarding wake up and nap length :-)
Something else to bear in mind is that the whole 2-1transition thing, when it doesn't go smoothly, IMO it isn't anything to do with us getting it right, our job is damage control, their job is to grow into 1 nap and eventually we meet at the end of it all and come out the other side.