There is nothing terribly better than the 2500k, so I say just upgrade.
Get an aftermarket CPU cooler and try some better/more case fans for the heat issue. Maybe change that PSU out (I've heard nothing but bad things about CM's PSU line.) and if you're one for eye candy, upgrade that 570. Besides that your PC is tiptop.
So the first thing to do is figure out what is running hot and what is making noise and it could be different parts. Also check your case fans, you can unplug them with the side of the case off to test if one has a bearing gone bad etc. With that said the stock CPU cooler and your graphics card will be contributing to noise and heat regardless of other factors.