Bill,

Don't trust the stub shaft on the existing Halfshaft anymore. I would replace it. Try to get a NOS OEM shaft if possible or a remaned OEM. The cheap aftermarket ones from Autozone ect are trouble as I have found out.

What I do is keep a set of axles and a spare set of front Kuckles already built up in the trailer with me.

Cheers