ElectricZombie,
Welcome! You already have some good ideas, and several other people have offered good suggestions, so let me throw my two cents in.
LED lights - It took me a while to get into these lights, and how to use them. The first thing that a person does when getting a new light is to:
1. Look at the bulb
2. See how far the light beam will throw
LED lights do great at impressing a new user for #1, but fail miserably at #2.
HOWEVER, for up close lighting, LED lights are the best! I have a couple of 3 LED lights that are great for using in the 0-10 foot range.
For working at anything within arm's length, these LED lights are actually much better than their incandecent counterpart.
I also have a Lambda Illuminator and an ARC LS Second
http://home.mchsi.com/~lambda/lambda.htm
http://www.arcflashlight.com
These lights are just Awsome at the 10-100 foot range. Better than any incandecent. Bright, even, pure, wide, snow white light, that doesn't get yellow or have any rings or shadows.
For lots of reviews of lights, check out this site:
http://ledmuseum.home.att.net/lambda2.htm
Now, for lights that pierce the night!
The "crem de la crem" of incandecent lights is surefire. Expensive, but the best.
Two lights that have "SureFire" like qualities, are the Brinkmann Legend LX and the Princeton Tec Surge. Do searches here to read lots and lots of info on these two lights.
While bigger than the SureFire E2 and E2e, the LX has a great beam, and does fit into a pocket, and is a 2, 123a battery light. Some people here have actually said that the LX has a brighter, bigger, better beam than the E2. I can't confirm or deny that. However, I own two LX's and like them a lot.
The Princeton Tec Surge is also a great light. I own two of them also! It does take 8AA batteries, and, while very compact, it is still bigger than the LX. Easy to cary, but not something that you would want to put in your pocket.
Both of these lights have perfect beams, and pierce the night!
When I go walking at night, with my dog, on the unlit dirt roads in back of my house, I use both the Luxeon Star Lights (Arc and Lambda Illuminator), mounted to my belt using a Nite-ize Lite-Lok, a device that attaches to your belt, and will hold a 2-aa light, and the Brinkmann Legend LX. The LX is in my hand, to spot my dog when she gets into "stuff" several hundred feet away from me! The two type of lights compliment each other, the LED's for "always on" light around me, and the LX, for piercing the night. Neither one is "better" than the other one, just different.
Go to:
www.brightguy.com
to see lots of lights.