I pull the OEM shafts out of a dana. The splines are straight. Just needs new u joints.
Prefer someone local(ish) to the Bay Area. 100.