Thanks for the tips. I'm on to it now, so I'll keep at it until I have it solved. I do have to pull off the bumper to redo a side clip, so I may pull the whole assembly out to really dig into it. Next weekend I have a pile of car repairs queued up across 3 vehicles - hopefully I have time to look at the headlight.

Cheers.

__________________
Daily Drivers:
- 2008 535i, 320,000km
- 2004 X5 4.4, 01/2004 production, 420,000km
- 1997 328i, 350,000km

Track:
- 1996 328i, track/race car, ~300,000km

Winter:
- 2013 Ski-Doo MXZ X 800 E-TEC, trail can
- 2007 Ski-Doo MXZ Blizzard 800 HO
- 2001 Ski-Doo MXZ 600 w/800 engine, exhaust
- 1978 Ski-Doo Olympique 340 (vintage race sled)
- 1977 Ski-Doo Olympique 340E