The intermittent headlight problem that appeared on the ride west turned out to be a short -- the Hot Wire is discolored, and there is some bare conductor. The tech at Sandia BMW is going to insulate the hot wire spade connector to see if that fixes the problem, enough to get me back on the road.