Where did you get the waterpump? Parts store rebuilt pumps are notorious for poor flow. After a new 4 pass radiator, three different thermostats, shroud, water wetter and hoses, I bought a Ford motorsports waterpump for the 347 stroker in my GT/CS and that solved the overheating problem.