An electric fan? If so, what brand and CFM?

The aftermarket ones don't work that well. There are some threads on here where people have adapted production car electric fans and shrouds to thier older cars.

What about just running a factory shroud and 18" fan with viscous clutch?