Caddy 2016 rear light upgrades

[Richiexx]

Hi
I have a problem with brake light bulb in bulb holder,
The terminal that touches the bottom part of the bulb seems to be burnt,
This is the second time this has done it since owning the van in just over a year, I fitted a new bulb holder to the van when this 1st happened, bulbs all seem to fit tight in the holders and was a genuine vw part that I fitted

Any ideas of a cure?
Also is there a replacement holder with leds that would fit directly?

Thank you for any adobe in advance
Rich