The Robert Shaw 330-180 is good for me, too. I also note the Mr. Gasket part change. Yes, it does work.
Also suggest Red Line "Water Wetter". They say one bottle, but I have run 2 and do slow city traffic well (.030 motors-cannot comment on bigger bore).
7-blade fan-good. Tight fan shroud-wave a rag in front of the radiator-look for "pull". Discovering these electric fans are pretty good as well (I'm old school).
If you have the thermostat out, pull the block drain plugs and give it a good engine flush-regular garden hose will do. Take the heater hoses off and flush the heater core backwards.
Finally, look at the radiator, and the fins (bent?). 2-core seems small-given low speed airflow in heat. Perhaps an air gun to blow the bugs/dirt out backwards.
Good luck-hope this helps.
Rick