Instrument Panel Bulb Sockets

Regardless what incandescent bulb number or LED is chosen we still use the same 5/8 twist lock sockets. I have a collection of 40 to 50 year old OEM sockets along with a dozen fairly new reproductions. All are garbage. The locking tangs tend to snap off the old originals. On the reproductions from Ebay or HELP LINE the locking tangs didn't snap off, they sagged/folded inward causing loss of contact. I suppose bulb heat could be a factor and if that's the case LEDs might be the remedy. Rather than experiment, waste coins, and get even more pizzed off, I'll ask the masses... Where to purchase OEM quality or even aircraft grade bulb sockets of this T10 type? TIA