Is the threading & diameter of the barrel/emitter the same as my Tiablo ACE (garden variety) as it is in the new ACE-G? In other words, would I be able to retrofit my ACE to being an ACE-G with the addition of just the the reflector and emitter while using my existing battery tube and switch? I'm finding that I'm getting extremely poor run times without using the extension tube (thus 2 18650's or 4 123A's. I would like to not have to carry a foot long light around if possible!