I think the macho is a solid choice, Not sure about the noise now though. But do you think that this HSF you got is working properly and making this noise? or does it sound wrong?
This bad boy is a little bit more but supposed to be the cats meow!
Noctua NH-D14 (2x 140mm fans and about 20dBA noise)
http://www.newegg.com/Product/Product.aspx?Item=N82E16835608018
Zalman CNPS12X has 3x120mm fans and runs from 22 to 24dBA
http://www.newegg.com/Product/Product.aspx?Item=N82E16835118097
OR there are a handful of wonderful closed loop liquid cooling sets out there (Closed Loop meaning that it comes ready to go, just follow simple mounting instructions) There are various models to choose from depending on how much space you have in your case for the radiator (single 120mm fan to triple 120mm fan radiators)
Corsair Hydro Series:
http://www.newegg.com/Product/ProductList.aspx?Submit=ENE&DEPA=0&Order=BESTMATCH&N=-1&isNodeId=1&Description=corsair+hydro
The H70 is on sale and a very popular choice
Antec Kuhler Series:
http://www.newegg.com/Product/ProductList.aspx?Submit=ENE&DEPA=0&Order=BESTMATCH&N=-1&isNodeId=1&Description=Kuhler&x=0&y=0
One thing that i do not know about is what sort of CPU you are cooling with these high end HSF's which could make the difference in recommendations.
as far as noise goes, The Stock Intel I7-980 hits the 40's for max dBA, i7-920 hits 27dBA or AMD Phenom II Stock coolers hit 30/34 dBA so some of these beasts are quite lower than that.
Also since you had the fan installed, Are you 100% Certain that the noise isnt coming from any other system fans? like a Case Intake or Exhaust fan or possibly the PSU fan? Many times companies or end users just buy cheap fans for the cases and then stress about how loud their CPU Cooler is when its much cooler than some of the 80/120/140mm fans they just installed elsewhere!