Getting too hot

What water pump are you running?
There are a few electric pumps that do hold up and perform well on the street.
There is nothing wrong with electric fans either. Look under the hood of almost every new vehicle on the market!
A 180 thermostat will do wonders.