>>299935329
Rift S has better camera coverage, so I don't think you'd have the same issues throwing that you did on WMR. You'd probably be fine with something like that.
I wouldn't recommend getting a Vive now unless you can find one super cheap. If you absolutely have to have Index controllers, I think you might as well just get the whole headset.