I had all those parts sitting around so it would have been a cheap upgrade. It looks like bigger cells go on the wish list. I may still try an inside/outside cartridge with 18650's to get the voltage, capacity and extra weight that I wanted.
Thanks for pointing that out and saving me the trouble.