Do you mind slapping it into a PC part picker list? You can save a lot of money by for example not buying Tridant Z Royal RAM and just in general being a little smarter about your storage options. Also, what's your budget? $400 a part isn't a budget.
I think you should go with this configuration sans GPU, and buy an Ampere GPU.
This gives you about $1k to play with for your Ampere card. You could totally get something like a 3080 depending on their pricing.
Also new AMD CPUs will be releasing so you may want to wait for those