Well, I would change only the CPU. Why? I am with R5 2600 + RX 580 8G Gigabyte with a bit of a overclock. I have not yet overclocked the CPU
I currently play Forza Horizon 4 on Ultra with 75 fps all through the game. The card can make more but I have locked it on 75 so I do not get screen...