That's helpful info. it's good to see what happens through the night too as night sleep effects day sleep and day sleep effects night sleep. It's useful to see where the NWs are and if they might be linked to nap times/lengths or A times/lengths etc.
So, my thoughts. 4hrs A is a long time for this age, some will do 4hrs of course but it is on the long side of things.It looks to me like she was OT for her naps on this length A time as the 33min nap indicates inability to fully relax and move through the stages of sleep. However, it also looks like there is a chance that she might adapt quickly to the first A time being 4hrs, I say this based on your ability to resettle her and she did pretty well afterwards and the effect it had on the following days WU time (she went right back to sleep after that last NF and slept until morning). I will also say though, my thoughts are based on a very short period of time, two days is not much to go by. I would suggest then that if you feel 4hr A time is suitable you do it just for the first A time of the day, not the second too. the second A time I would bring back to 3hr 30.
The night feeds - just something to consider. Rather than resettling her at 11.40pm and 3am what if she was fed instead? She is waking again an hour later to eat so there is a chance you can reduce the NWs down to just the feed times and the last NF could work better to avoid that risky time when she may or may not go back to sleep. Here's how it might look
BT feed 7/7.30 (you usual time)
NF 11.30 (this is 4hrs since last feed, a normal amount of time really)
NF 3.30 (my guess is that the 3am NW might just move a little later based on feed times, 4hr since last feed) this is an easier time of night to resettle LO, when NWs approach 5am ish it is much harder to get them back to sleep IMO.
WU feed 7/7.30 (this is now approx 4hrs since last feed - it avoids a problem you have not mentioned which is lack of hunger at WU feed which could become more difficult further down the line)
It is of course just something to consider.
For the naps then. I would try 3hr 45 or 4hr for first A time if you feel this is working or she might settle into it - and if you go in at 25 mins into the sleep to do a W2S you might find it much easier than her fully waking at 33mins and having to fully resettle her. This can really help to get a better sleep.
Then 3hr 30 for second A time and if possible do W2S on this one too. Use the link for guidance but alter the time you go in, you need to be in there an ready with a hand on her or hovering to help soother her through as she stirs, so I'd go in at 25 mins and stay to help as long as needed.
Hope this helps. It can take a while to settle onto a new routine and certainly developmental leaps and teething will cause all sorts of disturbance!