You could do what I did and drop seven bucks on a 2x123 HDS tube (NEVER put two cells in it in your Novatac, though) at Lighthound, and do Hogo's brass bar mod to run an 18650:
http://www.candlepowerforums.com/vb/showthread.php?t=207486&highlight=brass+strip
Rechargable, and MONSTER run time. Read my comments near the bottom of the thread, too, if you are going to do this. Once you get the bar right, it works wonderfully. You do have to deal with the loose part when changing the battery, but that is not very often with an 18650.
Otherwise, it works fine with the long spring (sold at Lighthound also) and a 17670. I used it that way until Hogo posted his mod.