I would take the yoke to where you're getting the new u-joint. It might save you a extra trip.
I had to fix one of the drivelines on my batwing. Yokes looked okay until I got the new u-joints. They were twisted so bad I had to replace them on both ends. Guy at the shop said it's the weak link and they are suppose to give instead of the drive shaft itself twisting.