If nothing is wrong with the current motor then I would just start looking for a super 6 setup swap that in, adjust the valves, give it a good time up including timing and carb adjustment and drive it into the ground. No need to swap the rest of the engine for that. The rest of the engine is the same between a 1 bbl engine and a 2 bbl engine