I just jumped the gun when I saw decent prices on Ryzen 7 and 9 CPUs, moved my Ryzen 7 3700x to another rig and upgraded my PC, now running:
CPU : AMD Ryzen 9 7900 65w 12-core AM5 (49k cpu mark)
GPU: Nvidia RTX 3070
MoBo: Asus TUF Gaming B650-PLUS WiFi AMD socket AM5
RAM : GSKILL DDR5 5600 2x32gb
SSDs: 2tb SAMSUNG 980 PRO SSD PCIe 4 NVMe (OS drive), 1tb Intel 665p 1tb PCIe 3 (storage)
PSUs: already have good SeaSonic modular PSUs
I could've gone for a Ryzen 7 7700, but the price difference was only $80 so I splurged, got the 7900 for $399 from Amazon
I suppose I could've gone for a PCIe 5 OS drive, but I just bought that 2tb Samsung for $99 so I put it to good use, just cloned the OS from my old drive using Samsung Data Migration tool.