Thank you all for the input. The shop that did the frame swap had done several and I followed their lead on rivits. I have been using 3/16th by 1/2 inch aluminum
rivits with no fiber washers. I will track down some stainless pop rivits and the proper washer and hope this exercise becomes a distant memory. The wavey spring washer sounds good also.