looking to get a vr headset. have ideas want advice

im going to be selling a 2nd pc i dont need and with money i have i want to get a new vr set up. i just want to make sure i get the best bang for my buck. my gaming rig runs a rtx 2080 super 8 gig with a ryzen 7 3700x and 64g of ram.

i have the OG vive with wireless adaptor and id like to keep wireless. so im looking toward a vive pro 2. i dont use my current vive anymore because there is something not working right either with the headset or the base stations and it loses connection with steam vr randomly and i cant reproduce it.

was looking at htc vive pro 2 because of wireless and then i would jsut get the index controllers for it cuz those are nice. ignoring price what would work best on my system. or would it be better and wait for another headset thats coming that may have wireless. i may skip wireless for now if there isa really good reason too or if it will be supported with a headset in the future.