I would definitely go for Cooler master hyper EVO 212 it should do a decent job, i recomend not to consider Deepcool gammaxx 300.
and since you mentioned new cpu, what is your budget, i would recommend ryzen 2600 or 2700.
but i recommend to try what i said above and if your pc doesnt turns...