Before I tore the motor down, I would check the ignition timing at 2,000 rpm and be sure the dist advance is working correctly.
I had one dist that had worn slots in the advance plate and it would actually retard the timing at higher RPMs. With a different dist, that motor made great power and spun as fast as you wanted it to go. Gene