This is the heatsink I bought recently, and I love it.
http://www.newegg.com/Product/Produc...82E16835186134
My cpu idles at 35 or so, and I have yet to see it go above 50.

My wires inside my case are a total mess as well, so if you've got that all nice and tidy I imagine this will keep it very cool.