> I’ve had to remove it all twice but with every significant update, somehow my settings get reversed and we’re back at square one.

You're not removing it properly. After I setup my first install of W10 nothing has ever been changed or reverted after any update.