Become a MacRumors Supporter for $50/year with no ads, ability to filter front page stories, and private forums.
I also took a backup, did a full reset then restored. No data loss (just had to remember to make sure the 2FA stuff was backed up, disable 2FA for a couple of things temporarily and reset up the apps that don’t backup like banking and similar). Suprisingly easy in the end.

Just a suggestion on the 2FA. Use Authy. Let's you have 2FA on more than one device. Makes it so much easier to deal with.
 
Just a suggestion on the 2FA. Use Authy. Let's you have 2FA on more than one device. Makes it so much easier to deal with.
Thanks, will give it a look. I’m using the MS app at the moment which does backup to iCloud but dual devices sounds good.
 
Thanks, will give it a look. I’m using the MS app at the moment which does backup to iCloud but dual devices sounds good.

That’s a pretty old recommendation. Authy is no longer a suggestion as it’s had its security issues.
I now use 2FAS.
 
Register on MacRumors! This sidebar will go away, and you'll see fewer ads.