Peter a couple of things you don't mention but given your experiece you may have already considered?
Deleting the OneDrive from the machine has still left all your content on the Fluffy Cloud and so liable to copy etc if you/they are hacked. You may want to go in through the Cloud interface and delete it or leave it as an archive?
What you outline are two slightly different things ? Windows 10 is the O/S and can you imagine the trouble you have had doing that using WinXP a few years ago. They have at least made the BSOD and reinstall a lot easier which is probably based on a lot of feedback 8)
OneDrive is part of the MS account, same as iCloud Drive is for Apple etc. Along with Office365 this is part of the productivity suite and they are now trying to make everything Cloud. Primarily so they can get you on a monthly charge but also so that everthing is accessible across the 20 devices they thing everyone carries now. Which is at least a little more useful.
if you are able to delete the new browser Edge from your system you will be a god, do share!
