I'm in the same boat but using a newer build.
Couple things. Ryzen you'll save money in the upper middle class line, but top end choose your flavor really. Intel is better gaming performance and AMD is better workload performance. Both are fine for either, were talking 5-10% difference.
3000...