This is the current state of the circuit board and schematic, complete and utter chaos:

http://imgur.com/a/sruev

All SMD components have been moved to the top layer and a second footprint for regular through hole tact switches has been added.

These are not as low profile as i would like them to be but, from the list of available parts this is the only one suitable.

All low profile replacements with a higher actuation force are too expensive, these Omron switches are withing the budget.

All solder connection have been moved to pads on the backside of the board, entirely as SMD pads and not through hole pads.

A jumper and resistor has been added to disable the temperature sensor of the battery charger.

The discrete LEDs have been replaced with RGB LEDs.

There is a rough draft of the metal core PCB as well, the current idea is to to have three footprints for LEDs to enable this to be either a single or dual head design.

At the moment they are spaced further apart to have enough room for lenses.

But this may change and be replaced by a custom reflector.