Peter,
I thinks its great you will be at the SHOT show. However, I am surprised you do not take more advantage of the Industrial trade shows for HVAC, Electricians, mechanicals,etc........
Majority of my clients and their workers in these industries still use the mini maglite because it is durable and Made in the USA (they are blue collar guys where this aspect still matters to them). I think you offer both of those traits plus smaller form factor, longer runtime, better brightness.
I think to many flashlight companies try to appeal to military,LEO,swat, and special forces, because it makes cool marketing. But I believe there is a much larger untapped market in the HVAC and mechanical industry.