New radiator, fan, and fan clutch did the trick for me.