Hello, I'm going to have my tank painted and have to remove the cap and latch. The part number for the cap pivot pin is 17514-323-300, but no longer available. I'm not sure about the latch pin/rivet number since no number is listed. What are you guys using? Thanks