Thank you, I will keep that solution in mind. It appears we have found someone with a salvaged connector. So, now I will swap the pins out, if possible. If that fails I will try a Napa type H7 connector.

I watched a you tube video that said to grab the connector with pliers and pull it off when changing the headlamp. The end result for me was a cracked connector. Won't do that again!