Another thought on the extra lights mounted to the crash bar. I have the Stealth lights from DK (great lights and cheap) and the reason I really like them is they are a different color temperature than the LED headlight and passing lights. There are times when those stock LED lights are invisible which I have witnessed too many times looking for bikes in my group behind me. In the daytime I mean, of course. The DK lights are always visible and give me confidence that someone will see me coming if my LEDs are at an angle that makes them disappear.
I am not sure of the legality of the number of lights I have for here in Missouri, but I have never been hassled, so I am not worried about it. I just want people I am approaching to see me coming.