Prebuilt Advice

I am looking to buy a new pre-built PC. I plan to give this one to my son. Budget is sub $2000 USD. Here is my current computer. I am of course, looking for something better.

CPU: AMD Ryzen 9 3900X 12-Core Processor

RAM: 32.0 GB

Storage (2): SSD - 931.5 GB,SSD - 931.5 GB

Graphics card

GPU processor: NVIDIA GeForce RTX 4070

Graphics clock: 2475 MHz

Dedicated video memory: 12282 MB GDDR6X