Thanks for this Ron. Well written.
One idea (coming under the heading of "I wish I'd thought of that") I got from the German BMW site I look at is to paint the inside of the headlight white. Not original but it gives a bit more light when tinkering. Though of course with a Lucas switch you can take it off the bike to work on, can't do that with a BMW.