Was wondering what should be used for the pin 1/4 inch bolt roll pin shear pin? The hole is extremely worn out so I'm having it machined with new hole.
None of the above. 1/4" coiled spring pin, aka spirol pin. Not much sense trying to fix that driveshaft, IMO. It's fairly easy to make if you have tools, and plenty of places sell new ones.