When I was in Martinique a while back Amel had the forestay down (for other damage) but they did replace the rivets with hex bolts that went into backing plates inside the foil.
They had the backing plates.ore-made and they fit inside the foil just right.
Much more robust than the rivets (better purchase) but..
It's bi-metal so steel against aluminum. So, the quandary was using tef-gel to prevent corrosion or using loc-tite to keep the bolts in place.
I opted on tef-gel and a re-tightening basically every month or after a spirited sail.