1966 911 Headlight wiring sockets

Hello fellow listers,

I tried a search on here and Pelican, but did not find the information I seek:

In my 1966 coupe, the headlight sockets have three coils of wire that the factory wires slip into. This method seems to me to lack safety features and if one of the wires slips out, a possible short could occur. What do you recomend to either keep the wires firmly in place (perhaps wrap the socket with electrical tape?), or a replacement socket?

Thanks in advance.

PS. At some point in the near future, I'll install a headlight relay kit from Marcus Surco, so any consideration there would also help.

Anyone ever make a change in the sockets??