vive headset and knuckles controllers with lighthouses and fbt pucks would probably be the best combo, the vive controllers (dildo's) are pretty meh but i think you can use knuckles with the vive lighthouses so it should be a viable upgrade