Reporting in, all done and dusted. CBHC, all games playing from USB with all DLC and online, tested MK8 and Splatoon multiplayer so far.
Couple of follow up questions... when I formatted the console, I got a warning to delete the eShop account associated with the console by going to the eShop...