I went with a stock 19 inch seven blade clutch fan.
I also advanced my timing which helped and had my baffles in. I used a 180 thermostat at first, but then removed it just to eliminate any possibility that it wasn't working right. I never re-installed it.
Cooling issues are almost never just one thing. You have to have most things dialed in for the temp to stay at normal operating temp.
I've read quite a bit on electric fans and in the end, the only advantage is cooling when the engine is off. They won’t help you when used in addition to a stock fan while the engine is running. There's only so much air you can put through a radiator before it becomes in efficient. Stock fans work fine. Also, electric fans use power, which makes the alternator run harder, which takes power away from the engine, so in the end the extra money may not be worth the gain. Here's an article on it. There are others out there.