17 LEDs now superglued into the front reflector, I had to drill a 7mm hole in the back plastic for the very middle LED so it would stick out of the front instead of being recessed which would cause problems with the mounting bracket:
Next to do is solder all the LED leads together, which is where I deviate slightly from the wiring diagram above, in the future I might setup the front light so it can have a 'low' and 'high' beam by only powering just 5 or all 17, so to do this I'm going to wire the '+' line of 5 LEDs in a separate circuit, but normally I'd just wire all the '+' legs together (along with all the '-' legs together).