The answer here is simple. If the car in question is an actual CJ Mach, then the original crank should go back into the original block and assembled with correct N heads, C intake, cast exhausts and the rest. Take all the aftermarket bits and build a cammed beater engine to stick in a different car. Simple.