The fittings are a bit Heath Robinson Stewart. It's a dilemma because a new one might not be much better. Have you tried a new bulb? The prongs will be a bit longer and it might just hold better.

DaveW
'05 Red Roadster S1
'16 Yellow (Not the only) Narrow AR GDI Plus 4