Buy yourself a new car and enjoy your current rig :-)
Your experience will only change marginally with these upgrades. I enjoy my car a lot.
I stick with my 1080Ti & 3600X until 200% performance are available for a reasonable price. No, neither the 3080 or 3090 provide this. I already enjoy 90FPS modest quality/60 FPS high quality in VR. on my 1080Ti. Even a 3090 would not be good for 180 FPS in VR with current CPUs.
A G2 is a very nice headset, but so is the G1. If you don't own a G1, go for a G2, else stay calm.