Price being equal, I'd go with a 6900 XT for your needs. You can use the added rendering power for VR, and you won't see the benefits of Raytracing in those titles. But prices are not equal... if you can find the 3080 for ~£200 less, go for that.
Regarding the PSU, I'd move to a higher capacity CPU >=750W. You could run a 3600 and 3080 or 6900XT on a quality 650W PSU, but you'll likely not get much/if any OC headroom, and you'll always be a bit worried. Always cracks me up when people don't want to spend money on the cheapest component that could basically make or break (literally) your rig.
Regarding the PSU, I'd move to a higher capacity CPU >=750W. You could run a 3600 and 3080 or 6900XT on a quality 650W PSU, but you'll likely not get much/if any OC headroom, and you'll always be a bit worried. Always cracks me up when people don't want to spend money on the cheapest component that could basically make or break (literally) your rig.