Here’s a quick fix for some of the rivets on your ‘cat. I had an intermittent connection on rear (anchor) light. Traced it to a butt-splice that was not solid. I drilled out the three rivets holding the light receptacle on the hull rather than trying to hang upside down in the battery compartment to see what was going on. After replacing both butt-splices, I went to Home Depot and bought a pack 4 for #12 by 1″ stainless steel screws (with tapered head to match the receptacle). They fit the holes drilled for the rivets perfectly. I put a dab of locktite on each, threaded them in and done.
.
