As best I can tell, the lenses are Glass (one of the reasons for the weight gain), so you might be able to polish out the scratch with out too much trouble. Surprised they would scratch so easily.
One other guy had the idea of splicing the bike harness to the LED harness, and eliminating the H4 connectors. That much less bulk to deal with behind the fairing.
In theory, Theory and Reality are the same. In reality, they are different.