Bonnet Latch Questions

First I’ll apologize if this has been previously answered, I searched and found similar threads but I wasn’t sure if I should revive an older thread or just go ahead the start a new one. I’m sure someone will point me in the right direction.
Basically in my first weekend enthusiasm I managed to break the fiberglass tab molded into the bonnet that has the stainless wrap that the spring clips attach to. I was able to fabricate a quick fix to keep me on the road but I would like to upgrade(?) to the S4 style catch plates.
The first question is, will the S4 style catch plate fit the S3? Very newbie question. And secondly, when installing the “penny” washer backing support what size and should I be forming the washer to the fiberglass panel before installing the rivet?
Please go easy, I didn’t break it on purpose.

How about these suggestions. The stainless buttons work brilliantly for me.

viewtopic.php?f=36&t=46615

I see no reason why it should’nt work. I have S4 latches on both my Sprint and S3. The Sprint has the
S4 latch catch and the S3 has the fiberglass tab but the openings look identical.