While both the Oculus Rift and HTC Vive are considered complete bundles, the Rift is ahead in terms of fit and finish. Oculus also announced that the Rift bundle (headset and Touch controllers) is now at an all time low of $399. This makes the Rift significantly more attractive than the Vive and with the uncertainty behind HTC, we can no longer suggest the Vive as a viable second option.
There is word in the industry that HTC is also about to bow out of the VR business and is looking for a buyer for its VR technology, so spending money on a new Vive right now isn't something we recommend—unless you can score one for an obscenely low price. But keep in mind that support might end up being nonexistent.
The real issue with VR however is content—and we haven't seen major breakthroughs yet this year. Gaming content has improved since a year ago, and there are some excellent titles to play with. Oculus also just launched its new dashboard, which allows interactive interface to the Windows desktop. The company is putting more resources into developing content and experience than any other company in the VR space, so we feel solid about an investment into a Rift headset.
Keep in mind, though, that the gaming ecosystem for VR is still in its infancy. Developers are still trying to learn best practices and more investment in content is required for VR to really take off. Despite this, Oculus is inspiring confident in its product by continuing to push R&D.