The real fix
1. STOP rolling updates into one big pile of poo, allow selective updates
2. STOP forcing installation of updates
3. ALLOW users to remove whatever they don't want- Cortana, Edge, the ton of crap you foist on paying customers.
4. STOP slurping customer info. Keep it ALL turned completely off by default. Offer a cookie if they'll turn it on.