Maybe I should started a new thread for this!
Still weighing the options. Either way it's a huge PITA IMO. Even though I have decent backups there's a whole lot of stuffing around in restoration/recovery that will need to be done.
Laptop is 6 years old.