I always try to prepare earlier, but till now it has never worked. I am chicken with pushing BT later. During weekdays he wakes up early and there is no other possible option, since I have to bring him to grandmas before work.
This time, it took Sunday, Monday and Tuesday for him to shift his time. Last two days he woke up around 7, that is ok for us. Hope this lasts!
On EW days I let him sleep as much as possible during the day, but it does not always work.