Yeah especially cause the socket and (I can’t remember the wiring off the top of my head but I think the spring is the negative) the negative is in good condition it is just that terminal that fell apart plus I worry about re-wiring things again with quicksplice since I’m kind of limited in space with soldering inside the headlamp area.I guess your are looking for something like these sockets that I found on eBay.
I would also be curious to know about a source for the bare connector without the leads crimped in, but these may be good enough for your purposes.
And keeping tension on the bulb's positive contact point.The spring should only be there for the mechanical purpose of holding the bulb in place.