Yeah, I'm considering a UCL and a two-stage switch. I might swap out the LED if I can get a decent bin color with a lower Vf, as runtime (or lack of) seems to be my biggest issue, but a two-stage clickie will also address that.
Funny story -
The other night I was at a restaurant with a couple of friends. It was a dimly lit restaurant, and when one of the guests at our table got his check, he was having difficulty reading it. I was already reaching for my QIII as I heard him say "anybody got a flashlight," then FOOSH! "OW!! MY RETINAS!!" as he leaned way back in his chair and shielded his eyes.
Turns out it was maybe a little overkill for a dimly lit restaurant, but he could then see his check really well. And everyone was impressed by the bright, HID-ish light coming out of that tiny thing. /ubbthreads/images/graemlins/grin.gif