Re: Daniel Stern -- he has a reputation for being eccentric. You either take his recommendation or he shuts off the conversation. Many satisfied customers and many perplexed by his "customer service". If you can work with him, things generally produce the desired results. Google shows this time and again.
The light and wiring kits would seem usable. The wiring kit looks to have the plugs and relays you'd need, with the understanding that these things are generally "universal fit". Hella is regarded better than Autopal for optical quality, pattern, cutoff, etc. and that's what matters most, but Cibie still seems the tops by comparison. Unfortunately their prices are at the top also. Any replacement will likely be an improvement over old, stock bulbs, so it really matters how much you drive at night, require brighter light (older eyes), and can afford to spend. Google specific products when you have things narrowed down, just for backup information.