>>292388817
I would lean towards keeping the Rift S for now, purely to keep mobility in case you do ever want to move your laptop and play elsewhere. Vive Pro is a meme. 
Base stations aren't difficult to sort for a hybrid setup but you may need to faff with recalibrating the playspaces occasionally. You don't even need to run USB cables to them, just wall power. For max portability you could use tripods or telescopic ceiling poles to mount base stations making them easy to move in case you want FBT elsewhere later.