I took some time off making a new mask. This one will provide a more secure fit, but it must be accessed with the entire assembly off.
The mask will mount independent of the light bracket. and additional lip is added around the entire mask behind the windscreen to prevent splashes getting behind too easily.
I still have 3 full kit, I will finish with this version of the mask. I decided to not make any more wiring harness and brackets, because it was costing me too much money and time.
You can get a hold of me if you would like to get just mask+lens protector, and make your own wiring harness and bracket. I will send you a copy of all the drawing you need to fit them together. I wouldn't want all the efforts that went into this go to waste.