Good info all, thanks for the input. Bike has 48K on it so the bill is on me. I run aux lights as well so during the day I am visible. Problem is at night the aux lights are too much for on coming drivers. I do plan on writing to the regional rep for BMW and see where that gets me. I'll take a crack at home repair first with the backup plan of new parts.
Oh and sorry for the highjack on the thread.