Returning customer - New build advice

Hi.  I am a previous DS customer having bought a Slade back in 2015.  It’s still going but getting time for an upgrade.  I was going to try to build my own this time but with the parts market the way it is that probably won’t be viable for a while.

Budget:  around $3,000 (can maybe stretch it up a bit)

Expectations:  This PC is 50% daily workstation for AutoCAD (Civil3D), Photoshop and limited 3D work.   Rest is 50% heavy variety gaming.   Monitor is 1440P

 I did two builds, one a more modest build and one a little beefier if I stretch the budget.  So Maybe can blend the two and come up with something in between

Build 1 config: 4217505 ($2,927)               

Build 2 config: 4219313 ($3,485)

Processor:  I am leaning towards the Ryzen 9 5900X.  I’m not sure if the 16 core is worth it over the 12 core.

Ram:  I know 16MB is plenty for gaming but did 32 for the higher build more for the workstation aspect but something I could potentially upgrade later:

Video Card:  Probably either a NVidia 3060 or 3070  but open to recommendations

Looking at the 500 GB EVO pro 980 for the boot drive base on recommended configurations.  After that isn’t decided.  I have a 1TB SATA SSD and two 1 TB Mechanical drives in my current PC.   So maybe a larger cheaper NVM drive for primary programs and games and reuse the sata SSD or one larger new Mechanical.

 Other things like motherboard and cooling just went with the standard option as I don’t know much about them or have no preference.

Special Needs:  I’m looking to stay with a Slade X as it served me well and limited space and dust/heat is a consideration.  I don’t really care about RGB, clear side panels etc.  I like the Bolt but concerned about limitations due to small form factor. 

Thank you for the input.  Certainly some things to consider.   Saving $200 on the 3060ti would be good if it’s not losing much performance.  Can put that money towards keeping other upgrades while staying closer to a $3k budget.  Can always upgrade that in a couple years. 

I haven’t been keeping as up to date on processors so most videos I had seen over the past year or so seemed to favor Ryzen as the top choice over intel so I guess I became a bit of a Ryzen fanboy though I’ve never actually used one.  So will need to look over current comparisons.  DDR5 is appealing.   Looks like it’s currently backordered but hopefully by the time I would actually make the purchase it would be available as I’m not in an immediate rush.  

I do lean towards staying with windows 10 for now.   One thing I saw said the Intel CPU would benefit more from windows 11.  But just have heard more “don’t switch yet” comments so far. 

The HD I would probably reuse the SSD but the mechanicals have some years on them so was leaning towards one larger new one that I can back up less important files and media on.