One piece of advice - don't switch ISP and upgrade to fibre at the same time. I did this when fibre became available a few years ago, moving from VF to Slingshot and it all went very wrong.
You should either switch your VDSL service to another ISP then upgrade, or get UFB installed with 2D then switch after any contract period. The first option is probably simpler and quicker.
I've previously asked ISPs, once I'm off contract, if I need to move away from them for 12 months in order to get the "new customer" deals - the answer is usually "no"