I tried a slightly different approach to sourcing the pins and turned some of these :

Click image for larger version.  Name: Cotter pin.jpg  Views: 151  Size: 116.8 KB  ID: 12950

Into these :

Click image for larger version.  Name: Catch pins.jpg  Views: 153  Size: 110.5 KB  ID: 12951