Range shift linkage failure on 3550 PST

This is the second time that this has happened (and the first time since the warranty expired). The range shifter went loose and would not shift anymore. It is a long disassembly process to get inside the gear housing. I found a broken roll pin which restrains rotation between parts 56 and 57 in the gear case. The slotted spring pin had slipped partway out and then sheared into two pieces. I am thinking of using a clevis pin with a cotter pin as a replacement to get a more positive way of holding the pin in place. Anyone have any thoughts on this solution? Clevis pins are typically harder than spring pins. Maybe more risk of gear damage if it falls out? I plan to post a video of the repair process on the internet somewhere.