Hi Louise! Just chiming in with some Nap POV

It sounds like you're having a rough, rough time. *hugs* hon...let's see if our 3 heads together can figure out these naps, the NWs, or both!
It kind of sounds like she's still having problems getting through the sleep cycle transition. This is developmental at its root, but if she wakes up and she's used to you trying to settle her back down, then it could be a prop issue, too. Hard to tell at this point, though. She just constantly seems to hit that 35min point and BAM! awake, regardless of A time...which is why I think it might still be the transition issue. But I think we've got a LO in a serious OT cycle, so it's hard to tell because OT naps are generally 35 minutes long.
If you don't mind...could you refresh my memory of how long you tried w2s and httj to extend her naps? I noticed that she took a long nap after APOP. When dealing with an OT cycle (meaning OT continuously disrupts both day and night sleep, versus OT which is more fleeting), I do recommend APOP for a couple of days so that LO gets some good sleep in...it kind of levels the playing field and gives us a clean slate, so to speak. I know you might be afraid to do that because you started using BW due to a feed-to-sleep association (I recommend the rocking in your situation as it seems she likes that). But, at some point, LO just needs some sleep. Furthermore, if it makes you feel any better, when DS has a cold (he's had 3), we've always done APOP to help him sleep better. Then, we gradually reduce that until he's doing his independent sleeping again. Don't feel guilty if you have to hold her elevated (or elevate her mattress, which really isn't APOP) for a night so that she can breathe and sleep...we've all done APOP at one point or another.

Re: holding back when she wakes up...I think after some APOP, it's worth it to hold back more and more until she reaches the "I need you!!" cry. If she short naps because she can't resettle on her own, then we can deal with that; but it's worth it, I think, to at least fully give her the chance to self-settle.
Fwiw, the NWs seem to be OT and maybe a bit of hunger driven, too, if she's not settling for longer than 40 minutes at night. It may be that she's been up so long that she realizes that she's starting to feel a bit hungry and then can't resettle. Have you tried just giving her a teensy bit to eat so that she feels a bit better, but not enough to throw off her appetite? We did that the other night during DS's cold/cough. Gave him a couple oz of water at 5 am, and he was good to go--didn't throw off his AM bottle at all (which I was totally surprised about).
Another thing running through my head--related to feeding--is I wonder if the solids are bothering her.
Lastly, I don't think you're messing with her internal clock when naps occur at different times during the day. EASY isn't a schedule anyways, so there's supposed to be variations. It's the overall EAS pattern that LOs thrive on...so rest assured there, hon.
Will wait to see what her day looked like for either today or yesterday; and we'll go from there *hugs*