Best setup: Sunwayman v11r. Carry your spare battery in a Spark Sk3.
For pure EDC, I'd say the Sunwayman V11R. The ring plus pushbutton is about the best EDC UI going (for me personally, at least), great size, incredible power on 16340. Right now, for me, the only products that are even close to competing are offered by Jetbeam and Niteye, also having ring controls.
I like to carry a backup battery in my jacket pocket or whatever, and with the advent of mini-sized 123 lights, I've decided it no longer makes sense to carry a spare battery in a plastic case, since a mini-sized 123 light is as small as most battery carriers and not much heavier -- and now you have a spare light, as well. I chose the Spark SK3 for this, it gave me none of the problems my Quark Mini did, and it specifically supports 16340 so I can carry either 123 or 16340 in it, either of which will run the v11r