Relays and fuses

On your mechanical fan, the shroud should cover the complete radiator core. The fan then is "directed" by the shroud, and does not have to

Like I said earlier, a 6-7A fan isn't much of a fan. It might not be worth the trouble.