Nice work. There seems to be a few variants of that same light switch. I used the one from here:
http://sicassracing.com/store/switch...3c5b375f6e36a4
It has a row of tiny LEDs across the top that can be hooked up as indicator lamps. I used the blue as high beam and the red for power on.