Simon,
Not sure if anyone asked you already this question but as you are already working on new S2 host maybe its a good time to ask.
Would you be able to produce a 18350 style headlamp with the head and reflector in the middle?
something like this (TN-20)
or this (EHL0628)
or even like this 
(S3 “eebowler”)
