Don't worry sweetie, we've all btdt wrt night time apop here and there!
You're going to hate me for saying this, but how about we add yet more A time on and see if that makes a difference? Waking at 30mims for some could signal OT but tbh they're usually easy (ish) to get back off for more sleep. The fact she's waking happy is making me think she could handle more. I know we've just bumped her up already and she does seem tired even before the 3hrs, but we've got to try something haven't we?
I'm not surprised she's OT by nighttime. The NW's could be a combination of the teething and/or a need to bump the A times and coupled with OT by the end of the day. A sort of UT/OT loop perhaps.
Are you medicating with ibuprofen? I would try that 20mins before her nap, push the A to 3hrs 10mins and do w2s at 20mins into the nap. Do you think you could give that a try and see? It can't get much worse can it?
Fwiw I had an awful time at around 7.5-8mo with my DD. Think that's when I joined here. We were plagued with 45mins naps her entire life and that was ok until the nights went to pot with long NW's. it was only through here I was given the confidence to push her. I think we were on around 2.75-3hrs A and by the time it was sorted at around 8.5mo, she was pulling a 4hr first A and on her way to the 2-1 transition! Turned out she was able to handle much higher A times than the *norm*. The only problem I ever had with pushing her was having too much A time to BT which caused us OT early night WU's (easy to resettle). All the long drawn-out NW's vanished (until the blasted canines came recently
, but that's another story
. Otherwise, once we found the right A for her she was suddenly capable of having a 1.5hr nap. All I want you to know hun is that there is hope xx