Yo so I haven't been around here in a fucking age
My Rift CV1 is kinda worn out and I'm in the market for a new headset. Thing is, I've got a big head and really don't like digital IPD because I max out the slider on my CV1 as is. On the other hand, I really really like the Touch controllers and they seem a lot more natural and durable (if less fully-featured) than the Knuckles. Also I really like the Rift's ability to force exit out of basically anything using the Home button, even if Steam locks up. I've already got both 2 base stations and 3 Rift sensors because of an FBT experiment a long time ago. 

With all this in mind, should I get the Rift S and be guaranteed an easy upgrade while dealing with Facebook's kikery, or should I get the Index and obsolete my Rift for greater visual quality and futureproofing? Are the quality control issues with the Knuckles that I heard about resolved now? Is the Index compatible with my tracking pucks and base stations or do I need to buy a full new setup? Can the Valve base stations be mixed with the HTC ones if I decide to do a larger setup? 

Anything else I should be aware of?