Check your timing chain for slack. Much over 6 degrees at the crankshaft is time to replace chain and both gears.
The OEM cooling system is near bullet proof, stay with it by using a good radiator, OEM pump, shroud, fan , fan clutch and thermostat.
418 miles on 19 gallons of gas. Can't beat the BBD !