So you’ve already done 1-2 modifications on lights, nice
Sorry I don’t know much about streamlight so can’t help with your switch question.