I won't switch from Mac anytime soon, but competition is always good. Can't wait to see how Apple will respond to latest Microsoft actions (WSL, Surface Book and Surface Studio).
if it responds. apple looks more and more like a luxury goods company and the things you mention aren't that. (not saying it won't, but i'm pretty sure 'how' isn't a certainty.)