These cotter pins were a came changer for me. I was having pin vibrating out while in use before. Now they are locked in!

Edit: Made a long pin with the hole moved closer to the tip if you wanted to use the clip mod for the drive spindle.