Might want to check with Steve at Berts before you invest in rebuild kit. He has indicated before the quality of the rebuild kits are not acceptable, believe he stopped selling them. Maybe he will chime in.
You can get a u-joint from Drakes that has needle brgs.
https://www.bobdrake.com/FordItem.aspx?Item=HB-7090