Your CPU and MB are fine. You won’t get enough benefit from upgrading to justify the expense yet. Wait for the new die set.
Upgrading to either graphics card will do you a great deal of good. As to Radeon vs Nvidea, thats personal preference at this point.
CHANGE that power supply out. It might still be working for you but multi-rail power supplies are dangerous.
Pick one that is single rail, 80+ bronze and from a reputable company (Antec, Corsair, Thermaltake, Seasonic)
For temps, get a Antec H20 920 or Corsair equivalent. It’ll keep the PC at room temp even with aggressive overclocks. It’ll set you back $70.