Thanks korreka I had seen similar ones on Amazon, but wasn't sure which size to get. They are pretty cheap though, so might be worth ordering some that are the incorrect size given the lead time from alliexpress.

Thanks for the tip on the wiring. I had already planned on replacing those since I had taken them off to remove the contact, so glad to know that was the right call