Don't put a mechanical fan on. Electric is the way to go, but the most important thing is to have a proper shroud. Flex-A-Lite makes excellent electric fan/shroud combos. I've used a few in the past with excellent results. They come with a temperature probe that senses fin temp, but don't use it. The best way to control a fan is with it's own separate thermocouple located right in the water jacket. There should be a location on your intake for you to install this thermocouple. Size your shroud so that it covers 100% of you rad, and you will never have an overheat issue.
Get this style VVVVV
NOT this style VVVVV