Headlight issue - What's next (after new OEM bulb & ballast)??

[JayZ235]

During a car wash last week, I had the dipped right beam error flip on and 30 seconds later, the right headlight went out. I purchased OEM bulbs (a pair, so colors would match) and after putting the new ones in, the right headlight was still out. I swapped the bulbs and sure enough, each worked in the left/working headlight.

After eliminating bulbs from the equation, the ballast was next. Ordered an OEM ballast and a few days later, everything was back working 100%! That is, until on the way home I needed the Minnesota salt off my car... Immediately after the car wash I'm filling up with gas (car turned off) and when I turn my car back on, the same (right) headlight is out, yet again and the dipped right beam error is on, about 2 hours after it's been functions 100%.

Polling the hundreds of you (I've read through a couple dozen search results on the issue) to see what next steps are, specifically from those who have put in new bulbs and ballast and still have the issue (I've found one other similar sounding thread so far). Could a wire be shorting when it gets wet and a new wiring harness is the answer or is an entirely new headlight unit next? Would hooking up to VAG-com tell me anything at this point? Let me know what you think.

[JayZ235]

Update (in case anyone ever goes through the same issue as above): I received various codes pulled through VAG-com and the shop pointed me to the Headlight Range Control Module as the potential culprit. The part is under $100, so I'll be picking one up and seeing if any further codes are thrown. From what I have found, this unit is responsible for firing a signal to turn the headlight on or off and mine is on the fritz. Feel free to offer any further input you may have.

[B6_4.2]

I had a similar problem when I was running DEPO E-code headlights, those both located the ballast on the bottom of the housing. Turns out the foam seals on the rear covers were too thick and ended up breaking the clips, then the covers essentially just scooped water in. That lead to the connector going into the ballast shorting out and wiping out the ballast as well. Changed ballast and went back to OEM housings, problem solved. Not sure if that helps in your situation... But figured I'd throw it out there and hopefully it helps someone.