I'd wait until prices are starting to come back to MSRP. $600 won't give you that big of an performance boost at this time. Until then, I'd stick to that 1070. It is probably still up to the task for most games out there, even VR.
If prices are normal again, then $600 can get you a nice 3070, and leaves you with some change for icecream