The corrosion will mostly (if not exclusively) found very close to where dissimilar materials meet. Mostly you can "repair" the problems you talk about simple by repositioning the eyestraps and fittings. Often moving it 5 mm up or down (1/5 inch) or to the side is enough for several more years of secure fittings. In other cases simply rotating the fitting so the new holes for the rivets are at least 5 mm away from the old hole is a good approach as well.

So basically reposition the fitting a little and drill new holes and use new bolts/rivets is the solution.

Wouter