Great post, DannoXYZ, but one quick correction: The factory harness doesn’t have H7 bulb sockets. There are adapters fitted to each H7 bulb and locked into the headlight assembly. He is probably missing these adapters.
They look so much like part of the bulb’s base that some owners have accidentally thrown them away with the bulbs, then found they couldn’t connect the wire harness.