2007 YAMAHA FJR1300 Electrical Systemwiring Problems

I WAS RIDING HOME FROM WORK IN THE DARK ON MY 2007 YAMAHA FJR1300 MOTORCYCLE ON A UNLIT, CURVY, RURAL ROAD WHEN BOTH MY HEADLIGHTS SUDDENLY DIED. ALTHOUGH I WAS ABLE TO AVOID CRASHING, THIS IS A HUGE SAFETY CONCERN. I AM A 30 YEAR EXPERIENCED AUTO/MOTORCYCLE MECHANIC AND CERTIFIED AS AN AIRCRAFT MECHANIC, SO I TROUBLESHOT AND FOUND THE HEADLIGHT FAILURE WAS CAUSED BY AN OVERHEATED/BURNED GROUNDING CONNECTOR LOCATED IN THE WIRING HARNESS ABOVE THE LEFT HEADLIGHT SHELL (BURNT CONNECTOR AND/OR PHOTO AVAILABLE ON REQUEST). BECAUSE THE CONNECTOR WAS NO LONGER USEABLE, I CUT THE CONNECTOR OFF AND SOLDERED ALL THE WIRES TOGETHER TO RESTORE THE GROUND PATH FOR THE HEADLIGHTS. AS OF TODAY, WITH 52,000 MILES ON THE MOTORCYCLE, THERE HAVE BEEN NO ADDITIONAL FAILURES OF THE HEADLIGHTS. I HASTEN TO ADD THAT THIS FAILURE IS UNRELATED TO NHTSA CAMPAIGN # 11V-338, WHICH ADDRESSES A FAILURE OF A...