This is what I do too. I have one adapter for each of my mods in hopes of preserving the threads on the PV.
I'd have to agree with Cocacola about the 18350 batteries. If you're going to go that way, at least bring one spare. Let us know how it goes? Maybe i'm just paranoid because I work 12...