Just FYI (since you've returned them) Arisaka Defense makes a Streamlight to Surefire tail cap adapter that should resolve the flickering issues.
I'd like to see Arisaka make a run of adapters that allow the old Surefire M95X tail caps to be used. These caps can usually be found pretty cheap on eBay and I think the general size and shape would look good on the somewhat large Streamlight tube.
Sent from my SM-G970U using Tapatalk