It's done !! Clean (custom) install rather than an upgrade.
That means a disk format so all files were backed up onto an external drive and all software needed to be reinstalled.
That in itself is a good discipline after a couple of years - though I have never practised it myself.