Option 2... I'm with Sam on all thoughts, one of the big reasons I went with mods is that I can grab batteries anywhere, even if Imeo stops making new devices I can get batteries (and wick, and wire...).
As I've said a few times before, IMO regulated is all that matters, a stead 3.6v is perfect...