Have you considered a larger case, instead of a new HSF? Chances are good that a larger case would give you better baseline airflow, which might make the cooling job easier as a whole (and fit the HSF you've already got).
Here's the case. It was the biggest I could find to avoid problems like this. Unfortunately it is designed to hold two systems, so you have to divide the space in half.Case