Can you use a probe of some type, and measure the length of the rivet hole? I would use a roll pin punch of the same diameter as the rivet hole. Then you will have your rivet size, and length. I sure hope this helps. I know how frustrating these little delays can be!
