Maybe its time for an efan swap. Save some weight, gain some power, reduce noise, increase reliability.
I've been talking to some professional racers and they vouch for clutch fans (some of them at least).
Reliability from an e-fan is questionable. Since it is electrical and can short/burn out while the engine is still running this does not make it necessarily more reliable. Your car can run fine and you wouldn't know your fan is out.
Sure you might gain 1-2hp that the engine is already making, but the fan might be parasitic to your electrical system depending on how many amps you are pulling. This might take away from the ignition system's power.
I'll try to find the debate between e-fan and clutch fan somewhere. Many people have shown that e-fans may have a constant CFM flow, but clutch fans are variable depending on RPM's.
Factory engineers are not dumb. But in short, replace your clutch fan if it is at all questionable. You can jiggle it fore/aft (towards radiator, then back towards engine). If there is more than a few mm of play, replace it immediately.