I'll put another vote in for the Arc-AAA Flashlight. Way brighter than the CMG Infinity, about on par with the Photon II. Run time is more than reasonable (4hrs bright, followed by many hours in dim mode), battery change is very, very simple and involves no tools, battery (singular) is easily available from just about anywhere.
My Photon has be relegated to the emergency role because of the long shelf life of the lithium cells. The Arc-AAA loses in that area because the best you can do is an alkaline battery and that doesn't have half the shelf life of a lithium. But on the other hand, you'll be using the Arc regularly, so the battery should die before it leaks.