Mounted the headlights yesterday.
Had to cut off the bracket for the popup motor to fit the lights around the end tanks.
In continuing with my theme of not welding anything if it can be avoided, I took the headlight popup post off the light, broke the plastic cups off each end to expose the threaded ends, screwed one end into the headlight adjustment screw (that one in the center below the light), then drilled a hole in the rear mounting bracket and threaded a 10mm bolt through the new hole. It's super solid now, but we'll see how it holds up after a few events.