I've a similar story and several teams at our company have switched to VS Code independently. There are some Atom "believers" though.
I hope github is going to continue working on Atom independently from MSFT. Competition is a good thing. But since both products target the same audience, from Microsoft's perspective I'd understand if they'd bring those brilliant minds together in one team.