Just a quick update. Cancelled my BA holiday and requested FTV inside the 3 week rule. Rebooked flight only with cash. Feel happier now I have more flexibility.
Was already in dialogue with the hotel regards an upgrade on arrival so will book directly with them in the upgraded room, fully cancellable.
Just need to keep an eye out for my original seats when they are released.