Overheating seems to be a common topic on this site and most suggestions to alieviate the condition are valid. We tend to tell what worked for us from experience.
You say the temp went to 220 at idle, what about on the open road with the engine running at higher rpm?
My experience has been hot idle caused by retarded timing. Just changing the vacuum advance source from stepped to manifold reduced the temperature at idle. A retarded ignition timing will cause the fuel air mixture to burn as it goes out the exhaust valves transferring heat to the block and coolant. Try a higher idle timing, if that doesn't help you can always change it back.
I would also think think the fan tips should be closer to the shroud but not positive on that one, it should be half in and half out though.
