Making switch tabs

I have been chatting in the parts wanted forum with some members who suggested I move the discussion here in the electrical forum.
I’ve removed the dash and gauges from my 67 barracuda for a refresh and a cleaning. I doubt anything has been removed since the factory as I bought this car from the original owner and it is unrestored.
While unplugging the dash harness from the wiper switch, 4 or so of the switch tabs broke off and stayed I. The wiring harness plug.
I e tested the wiper switch itself with a meter and it seems to work fine, other than these missing tabs.
I was thinking that it could just drill the rivet enough to remove the base of the broken tabs, and then make new tabs from brass and solder the new tab in place back onto the end of the old rivet head.
Has anyone here made tabs to replace broken or missing ones from the back of a switch, and if so what method/techniques did you use?

IMG_4417.jpeg

IMG_4414.jpeg