No, and no.

Nifty reflectors and precise aiming are great, but at the end of the day you're talking about a 3 watt headlight. There's just only so much light you're going to get from that thing. In no way will it be the equal of your 13W lamp.

The biggest drawback to the generators, in my view, is that the lamps are so dim compared to battery lights near their cost.

A second drawback is that they rob you of a significant amount of power, ~7W for the best hub generators. The drain is smooth, so you don't notice it directly as increased rolling resistance, but if you do the calculations you see that this power drain robs an ordinary rider of ~1/5 - 1/2 mph speed on flat ground. One scenario would be a minute loss per hour, at ~20 mph. Another scenario would be a loss of nearly two minutes per hour at ~17 mph. For that amount of speed *gain*, some people pay several hundred dollars for aero wheels, to give some perspective on the power cost of the generator.

Another way to put it is that a rider can carry a *lot* of weight in batteries, several pounds worth, and still use less power to to go a given speed than with the hub generator. 7W of power will buy you over five pounds of batteries on a slight uphill slope, never mind on level ground-- that's *way* more than enough batteries to run a light through the night. And that battery light could be *much* brighter than a generator-powered lamp.

Still, generators bring great convenience compared to batteries, that is true. Some of the better systems have auto switches. They'll come on whenever it's dark. They're very cool.

But as far as performance in illumination and rider speed, they're far behind battery lights.