When I first started using lights I used a Road Toad my GF had but wasn't using. That lead to a series of flashlights and bike lights that were brighter and better, but it wasn't until about 5 years when I got the "1,000 lumen" Magicshine did I finally have enough light.
I hope they do improve the optics. If you can ad a $5 wide angle lens to the Magicshine you'd think someone would make better lenses for the other lights that are out there now too.