agree with GIACUser, the only thing that pushed me over the edge on doing it is one question:
is this going to be your last ICE car you will own, even if you stop daily driving it? if yes, do it. if no, don't do it.
You are really coming down to the wire now of maybe the MK8 being the last ICE you will be able to buy? Many other models of cars are in the same boat before converting to a hybrid or full out EV, and there might be some desirables coming, so need to ask yourself, is this sticking around for more than a few years?
For me and my wife, we agreed this is sticking around for at least another 4 years, as her car is next to be replaced.