OK, where you are this probably feels just awful, waking at 4-somthing or 5 and resettling for 30 mins does not feel nice at all, but from where I am (safely looking at times on a computer screen) it looks like everything is going in the right direction. Being able to resettle a 4-somthing NW is better than a EW. I see those NWs as habitual, you will teach her to sleep through it.
I would hold where you are for now: set nap 1pm (whether short or long) and set BT 8pm.
Whilst you *do* ultimately want to offer her more than 10hrs night sleep (prob more like 10.5/11hrs) so BT will move earlier, I do not think now is the right time to move it, not just yet. If you continue at 8pm and resettling the NW she is learning to stay asleep and to wake for the day later, this is what you need and I'm afraid it does involve some OT to get her there. Obviously you are front line and know your LO so all decisions are down to you, I'm only suggesting based on where you are and where you want to get to.
The end plan as I see it will be to have set nap and BT which offers her roughly 12.5hrs sleep in 24hrs.
On CM days she short naps so may get say 11/11.5hrs - if she wants more sleep she will nap longer or lie in in the morning
On home days she long naps so may get say 12.5/13hrs - the extra nap time may balance out what she loses in nap time at CM
Whilst 8pm BT is only offering 10hrs (8pm - 6am) she still has the option to sleep all night, wake later in the morning, nap longer.
Eventually, perhaps in a few more days you can bring BT to 7.45pm then 7.30pm to offer a 10.5hr night with a 6am WU. If at that point she still needs more sleep you could bring BT to 7.15pm edging the night longer to (hopefully) maintain the WU.
Hope this makes sense. I really feel for you with the EW/NWs. BTDT, hated 5am, hated 4.30 even more, hated clock change...but you can and will get through it
ah - one last thing you might like to try is a W2S in the night. Either an hour before her habitual NW (so 3.30am ish? doesn't sound inviting does it? tbh never worked for my DS but I see it's been a winner for many) or when you go to bed go in and disturb her slightly to kick start a new sleep cycle, this can help even though it's several hours off the NW.