I hate to beat a dead horse, but you really need to find out if it is overheating because of lack of cooling (radiator, pump, airflow) or if the engine is generating too much heat (mixture, timing, vacuum leaks). Until you figure out which it is, all of this is guessing and throwing parts at it.

Besides, I thought it was OK again now.