Salbahe

Hello. Need everyones' 2 cents on this because I have tried many things without any success.
The right side xenon (low beam) headlight does not come on. But the other lights work just fine (hi beam, cornering, signal, etc). I get the "check dipped beam" message. Xenon bulb was replaced. Replaced the entire headlamp assembly due to a craked lens and water was seeping into it and soaked the ballast. Sprayed contact spray on the connectors. Still nothing.
I trouble shooted by connecting the left side (driver's side) headlamp assembly to the right side and sure enough the headlight does not turn on. I connected the right sided headlamp assembly to the left and the headlight turns on and works fine (the whole thing does its dip thing).
I'm inclined to think it's an electrical issue deep passed the wiring harness because I even swapped the immediate wiring harness that connects to the headlight assembly with each side.
Or could it be the headlight switch needs replacing?
Any ideas how to further trouble shott without going to the stealership?