I've used both Rift and Vive. I own a Vive. Buy either for the short-term good of VR.
Rift is comfier and easier to put on because of the integrated headphones
I don't blame my tools for shoddy skill - the Vive wand is just as ergonomic under the control of my spanner fingers as the Oculus touch controller.
Vive has out of the box tracking goodness with a superior technical solution which is going through new developments already.
Vive has Valve/Steam. Rift has Facebook/Occulus Store
Facebook might be trying hard with their money to buy out timed exclusives, but their approach to their shop front is akin to Uplay or the Microsoft Store. Steam has a far greater legacy for gamers.
Fallout IV VR is being developed for Steam VR, though Zenimax and Facebook aren't exactly on speaking terms considering that Facebook lost the recent court case
Elite Dangerous works equally well on both platforms.
Vivecraft is.... vivecraft and is awesome minecraft adaptation
Personally speaking, I do not trust Facebook with my information, so I stay clear of them. Nevertheless, steam's approach to open standards is worthy of support far beyond Facebook's proprietary closed shop approach.
edit: on Vive's tracking...
https://www.facebook.com/nathie944/videos/1391301200931216/