Given the choice...u joints

that's pooched. throw a new one in there, you're this far in and that's cheap insurance.
Unless he uses a cheap u-joint. That Detroit was a goodun.