The FAQ said that the later switches have replacable bulbs and I believe mine are due to the fact they and the socket are separate from the housing and contacts. Some of bulb sockets were corroded pretty bad and I assume that I need to replace those as well, but I can't find either.

I've been using www.realoem.com to do my homework and it seems to be nearly identical to a BMW parts dept. lookup.
Anybody had any luck finding these?