I would do the radiator cleaning/recoring first. It goes like this: radiator partially clogs, the fan clutch sees less heat and then dosen't engage when it should, then the water overheats. Most fan clutches are calibrated to engage from 170 to 195 degrees air temperature. With a normal road load on a flat highway with an outside temperature of 90 degrees, the fan clutch should be right at the point of engauging and dis-engauging.
Many fan clutches are replaced and then the radiator fixes the problem.