My personal opinion would be to drop the standard fan anyway, and replace it by a pull-type thermo. The largest you can find, that would fit on the radiator. You simply install a piece of s/s pipe somewhere in the radiator piping, and weld a boss in there that'll take a thermoswitch. That's if no provision is made on the radiator itself.

Non of that fan whine anymore, and you gain probably upwards of 3kw, and faster revving, and fuel economy and extended water pump life... But it's more about the 3kw than anything else...