For anyone following this post, I changed out the shaft and shimmed it and followed Lugnutz directions and everything came together well. It is all back in the truck, though I am a long ways from driving it. But that is one major project out of the way. Couldn't have done it without Lugnutz help.