engine still not cool enough

If your heating problem is at low rpm(crusing at slow speed and idle), you may want to try a smaller water pump pulley. I have gone thru this many times before with my own cars and others, and the smaller water pump pulley solved the issue. You may not be getting enough flow. Its worth a shot.