Nice sounding mill there, Greg!
Idaho - You might want to begin looking for one or two replacement lenses for those Marchals. I ran mine for over ten years then returned from a ride to see what was left of one lens (just a couple small hunks of glass) lying up against the reflector from a stone strike. The lens for an original will also fit the reproductions, BUT they are as scarce as hen's teeth. There is a guy in Florida who is the self-proclaimed US distributor for Marchal lights and he doesn't want to sell replacement lenses - He only wants to sell new pairs of the entire light.
Anyway, watch eBay or the Samba for a spare lens and just keep it safe in your shop til you need it. They sometimes pop up for $50 each or so - grab one if you find one. They were used on Porsche, Mercedes, Jaguar and some other marques so they pop up from time to time. I got a pair of lenses for $75 last Spring.