I use new MKI golf assemblies, mine are a special application because I need separate high and low beams, the 98+ s10 electrical switches ground and so you cant use a common ground on a 3 prong light, but you can get new assemblies with plugs and bulbs for less than $100
like this
https://www.classiceuroparts.com/pro...ion-kit-plugs/
rebuilding stock buckets feels like an eternity to the 5 minute job putting the new housings in. you may not need to cut the backs off with that setup I linked, but my new lights are so deep I have to cut the part of the stock bucket that holds the ring and then sandwich it in between the fender and the new adjuster.