If you’re going to use intel, go on user benchmark and look at a comparison between 2 cpus.
For intel, 8700k
For Ryzen, Ryzen 7 2700 or x variant for faster speeds.
for a gpu, get 2 1080ti s in sli with either a x370 or 470 if you’re going with Ryzen.
remember to get faster ram with the lowest cas timings you can for Ryzen .
Search what are cas timings on YouTube for what they are.
Go here for Intel:https://pcpartpicker.com/user/ninja_pc_guy/saved/fbwTHx
Go here for Ryzen:https://pcpartpicker.com/user/ninja_pc_guy/saved/ZNvHNG
I’m thinking you should rebuild your system and reuse your ssd and get a 1tb hdd