I bought the ebay kit, although I haven't used it yet, as I still need to remove the remains of one screw. The plastic sockets have been redesigned, apparently.
When I did the other side, I bought some sockets from X-part. I had read about using a 5mm drill to open them up, but when I measured the ball on the lamp, it was less than 5mm, so I didn't. What I did do was drill a 1.5mm hole at the base of each slot. I'm hoping that will reduce the possibility of it cracking.