Here’s what I got when I upgraded: https://pcpartpicker.com/list/Kn3hsL. In addition I have two sata ssds (1 TB & 2 TB) for data storage. It’s similar to yours. For me performance was the priority. Doing most of my gaming on Linux.
Edit: As the ram in my build are expo models they run at 6000 MHz. No instabilities.