Just had a quick read - it looks like things are going really well now!
Good to see the WUs have improved a lot and the nap seems to be going pretty well too.
Nap somewhere between 11 and 12 (most days around 1130 and anywhere from 1 1/2 to 2 1/2 hours, a few times she's woken up at between 1 and 1 1/2 hrs grumpy but went back to sleep with a little soothing)
You might just need to keep resettling on the shorter nap and she might perhaps settle down in a while...or you might see a pattern linked to either the earlier WU, the later Wu or the earlier/later nap time. if you see a pattern you can use it to help tweak a little but it sounds like you are almost spot on now.
The other thing is that she might be ready for set times now. At around 12 months it is often useful to move to set times for nap and BT rather than calculating A times. So you would basically stick to whatever time seems the most suitable (say 11.30am nap and 7.30pm BT) and keep at that. if/when things go a bit off track you still tweak the routine by moving nap a bit later or capping a bit earlier etc but then stick with it. it means the times don't change every day and LO has a good chance of self regulating on the sleep.
hth x