Looking for Advice on Upgrading My PC

Hey everyone! I'm looking for some advice on upgrading my PC. I built this machine back in 2018, and while it's still running well, I'm noticing that newer games are starting to demand more power. Here are my current specs: ASUS Tuf Gaming x570 WiFi motherboard, Ryzen 7 3800X CPU, Gigabyte 2070 Super overclocked GPU, 16GB DDR4 3200MHZ RAM, 1TB NVMe storage, and a 750W gold power supply with fan cooling.

I plan to improve a few key components: definitely the CPU, GPU, and motherboard. I'm also considering adding more storage and bumping my RAM up to 32GB. For the CPU, I'm looking at the 5800X3D, and for the motherboard, I'm torn between the Gigabyte X570S AORUS Master and the ASUS ROG Crosshair VIII Hero (Wi-Fi).

As for the GPU, I'm a bit lost. The 40 series seems overpriced right now, and the 50 series isn't impressing me. Should I stick with NVIDIA, or is it worth switching to AMD? My budget for the GPU is around $600 to $900, maybe willing to stretch it to $1000 if needed. Any insights or tips on where to start with these upgrades would be greatly appreciated!