Most, perhaps all, of what needs to be said regarding your cooling system, has been said.
So I just want to touch on ignition timing.
Most of us here have been tuning cars for over 50 years.
IDK about the rest of the guys but as for me, tuning the idle-timing by ear, for highest idle, is IMHO...