IMO: Rift has way better controllers, but head-tracking and room-scale is so much better in Vive-land. Edge for me goes to the Vive, but you can make an argument for either.
True! I'm excited to see them, but I haven't spent time with them so can't really rely on them with a recommendation. Right now, the Vive controllers are a step back.
Valve has been showing off new controllers [1] which look really neat, but also points to the more open ecosystem of something like the Vive over Oculus' seemingly more closed platform.
https://www.vrheads.com/valve-knuckles-controllers