Hi there.
Well you're still doing great with the improvement on putting down and settling for a nap, so keep that in mind when you're struggling with the night wakings and short naps. It's always good to remember the positives
yes I think the A times need to be more consistent throughout the day and also to work (quickly-ish) towards dropping the CN.
It's true that LOs can prefer a longer A here or a shorter A there depending on their character and what stimulation they have but this is only really advisable if you are getting good naps from the different length As. When you're not getting good naps the way I'd go is to make the As consistent throughout the day first.
I would suggest bringing the first A up towards 3 hrs, gradually, 15 mins every 3 days. Bring the second A a little shorter, back down to 3 hrs. This will help you drop the CN. If the naps are short they will at least be more spread across the day allowing you to drop the CN, if necessary you could put down to bed early for a while.
This change in routine is a bumpy period and it takes a while to adapt to it but as naps and nights are not running smoothly at the moment anyway it can't really be any worse right?
Your day might look something like this in a couple of weeks (do go gradually with the A increase but keep an eye on where you are headed, going too slowly will just keep her UT leading to OT)
WU 7.00
A 3hr
S 10 - 11.30
A 3hr
S 2.30 - 4.00
A 3hr
BT 7.00
At this age and with routine changes you need to be a little flexible and creative with the feeds. There may be more than 4hrs between milk feeds but do remember that she is also getting a solids breakfast too, so it won't be over-long without food.
FWIW I found if I gave solids later than 5.15pm we had unsettled nights. My guess is unsettled sleep due to digesting the solid food (possibly gas too) and also possibly not hungry enough by the BT milk fed to take a really good feed in. The milk helps through the night a lot more than solids does so keeping the focus on the BT milk intake helped.
hope this helps. Do ask if you need clarification.
xx