Sounds like you have the block cleaning covered and timing is in the ballpark. Vacuum advance would help but you shouldn't be overheating without it. How about radiator thickness, WP type and WP/fan pulley ratio?