Consider dealing with a driveshaft shop in your area, one that rebuilds them etc. They can identify the correct parts. I had my mechanic shop do my u joints and they ran into similar issues. All fixed up right when they called the local driveshaft/axle shop.