Soldato
I've gone for the rift because its a) cheaper and b)sooner
I mainly want to play driving/flying/space games and already have wheel and joystick, so I'm happy to wait on the controllers until theres some really excellent games to play (everything so far looks more like a tech demo than a properly fleshed out game)
I would absolutely love an omni-mill plus gun controller for FPS, but I think the hardware plus games for that are still a year or two away
Have you preordered? Currently the preorder queue is back in June for a Rift.