Wipac Tail lamp - disintegrating

Hi - I am getting close to taking my S3 for its MOT. Just running through the MOT checklist yesterday I found that both tail lamps were not working. Removing the lenses I found that the bulbs lit if you held them in but the slots for the lugs are loose and the bulbs are just slipping out. The fittings are are by Wipac. Are there any better quality parts out there? Perhaps L.E.PEREI? They are twice the price ...

I had similar issues with WipacI bought more expensive ones from my local supplier and they were better. Not sure what make they were though