Fan too close to radiator?

Get a fan shroud and adjust the spacer to put the fan blades about half in/half out of the lip of the fan shroud. They make spacers in plenty of different sizes.

A fan clutch will help get you some power back by not spinning the fan at full speed all the time. But since they can only decrease the fan speed compared to the water pump RPM they don't improve cooling.