The latter should be much sooner.Headset could handle asynchronous timewarp instead of the PC. Would help a ton when the occasional hiccup happens.
The former seems a bit challenging. Pushing a high resolution at a high frame rate reliably seems hazardous.
GearVR with tracking hopefully comes soon. It's the one thing that makes GearVR feel like trash relatively.