So this is the final wiring solution ive come up with, still mostly using parts that I have from around the house and cannibalized from the peq box and the original wiring. I've decided to run the external button to turn the laser on and off (since you cant use lasers in most places) through the original on off turn dial at the bottom of the box.

(This is before I soldered the connection of course. I was just testing the button)
And of course here is the final comparison. You cant really tell but there is MUCH more light this time that my camera was able to even focus. It might not look like much but in person its a significant improvement. Plus it has a real laser. Ive got that going for me. Which is nice.