Those are all good suggestions for flashlights and I, too, am looking for the right, smaller sized, LED for work.
Anybody needing a great 4D lantern should consider vt's recommendation of UK's Vectra. It runs equally bright on NiCd cells and the rep. claimed their 18 watt lamp can be substituted for the, two, 5.8w that come with it.
The 18 watter will only work well with rechargeable D cells due to the heavy current consumption. The on-off switch also selects which lamp is connected by rotating the switch. You could keep the 5.8w in one socket and install the 18w in the other and have your choice of brightness levels.
I haven't tried this yet and am just passing on what the UK rep. said in an e-mail.