Quick update.
I wanted to upgrade to a Ryzen 5900x but wasn't able to get one. I was able to get a 5600x on launch day. Going from a 3600xt to the 5600x made way more of an impact than I would have expected. I have PC Mark and 3D Mark scores from 3600xt/GTX 1070 to 3600xt/RTX 3080, then 5600x/RTX 3080. Pretty significant uplift each time (biggest going from the 1070 to 3080).
So now my system is:
Ryzen 5600x CPU
Nvidia RTX 3080 graphics card (Gigabyte gaming OC)
32gb (4x8gb) 3600mhz CL14 RAM (Trident Z Neo)
ASUS ROG Strix X570-E Gaming
1TB Samsung Evo 960 NVME M.2 SSD
1TB Intel 660P NVME M.2 SSD
Samsung Odyssey G7 32" Monitor (1440p, 240hz, 1ms GTG, HDR, 1000R Curved)
Really really happy with it. Not worried about getting a 5900x anytime soon, but if I can I'd like to and I'll move my 5600x to my VR PC that also has an X570 motherboard, currently running the 3600xt I took out of my system.