I had one of those fixed at my driveline shop. He replaced all the joints and held them in with washers tack welded on the outside of each joint.

Your solution makes more sense.

Happy trails, Login to read more.