For now, I'm probably going to stick with the 2600, since that doesn't seem to be a bottleneck.
As for the graphics card, I'm probably going to stick with the RX 580, as the 5600 xt, even on amazon used, is about $200, which is out of the budget for my system. If that's not enough, I'll try to find a used 1060. Which would you guys recommend between the 580 and 1060?