Mike, the fan I posted is the simplest and in my opinion the easiest route to go. At only 19 DBA, it's silent....and also 4200 RPM. That's pretty darn amazing, and Papst are NOT going to fail on you EVER.
The heatsink posted here is very nice, but will completely prevent you from upgrading...