Check the following for some very good info:
http://reviews.mtbr.com/2011-bike-lights-shootout
http://road.cc/content/news/46538-bi...ghts-test-data
For the best one-piece lights consider the Niterider Mininewt 600, Cygolite Expilion 500, Serfas True 500, Lezyne Superdrive... These are the good lights at bike shops as opposed to "the awful lights at bike shops" you appear to be familiar with.
Also suggest looking in the Electronics and Lighting Forum:
http://www.bikeforums.net/forumdispl...ng-amp-Gadgets