Yeah, shortly after making the post I think I found what I was looking for. I ordered a Trustfire TR J1 and will give it a try. I have also thought about drilling my Intova out another 1/16 of an inch so the 18650 battery would work. If the Trustfire ends up not being what I want, I will try...