In all reality, the new timing set is probably all it needs. I can rock the crank 10° before the rotor moves, so i figure that's the main issue. The plastic coated cam gear teeth are probably falling off.

Don't really want to change the gears, got 2.94s in it with an OD A833 for cruising on the highway. This car will barely break the tires loose dumping the clutch in first gear though.