IMHO....Doing a good thorough rebuild (Bore the block & an oversize piston, rod journal recondition, Valve grinding, Seals & Gaskets) will always be way easier than a retro fit! Upgrading to newer engines always brings more troubles than the advantages. While you do it, do some fresh painting, cleaning, & always rebuild the carb at the same time. Good Luck!:thumbsup: