I ended up choosing a Dinotte 200L with the AA batteries. Dinotte is having a sale on the light and a helmet mount (no batteries or charger...which I already have anyway) for $109. Pretty good price, methinks. I ordered direct from Dinotte.

I can't wait to get it.

Also, I found this nifty thread on the mountain bike forums: http://forums.mtbr.com/showthread.php?p=3910670

If you are handy with that kind of thing (or you know someone that is), you can make your own lights. DH is an electrical engineer and he wants to try making one, so that should be interesting