Nice write up and very sharp car!
For the bold and brave there's an older thread detailing how to repair a faulty NSS switch, I followed that guide once and it worked like a charm.
It should be noted that the repairing involves drilling out the rivets so they must be replaced by something else after repair, I used very small diameter bolts and nuts.

http://www.peachparts.com/shopforum/showthread.php?t=112452

__________________
Tomas, Sweden
1966 Mercedes Benz 230S with OM617.912, automatic. Disk brakes from W108
1983 Mercedes Benz 300TD grey, OM617.912 and 5-speed manual
1983 Mercedes Benz 300TD blue 7-seater, OM617.912 and 5-speed manual