Shifting the day along by an hour (or whatever amount you need to get WU and BT at a reasonable time for you) is not a long term thing, it's short term and shouldn't take more than 1 week. There can be disturbance during that change but as you are experiencing a disturbed routine anyway I wouldn't think it much worse.
If you suspect she will wake early you can use the W2S method I linked above to help her stay asleep, it also tends to be quicker and easier to resettle an OT nap if you use this method rather than letting her fully wake.
If naps are OT they should be easier to resettle, it might take some effort if she fully wakes and cries but she ought to go back to sleep.
If you don't get her back to sleep you could add in a later CN and shift BT later in one day. The key to shifting a day along is to keep at it, LOs rarely move the routine the way we want them to on their own.
The other option is to leave the day as it is and let the routine settle down, that means accepting the 5.30/6am WU. These WUs are not considered EW as the night is a good length. True EW is when the night has gone too short.