I also converted to clevis pins with hairpin/carriage retention clips. Much easier to remove and install.
I can’t find my notes but I got them from McMaster Carr and they are metric. I couldn’t find the precise length needed but that was easily solved with spacer washers.
Larry