How long are your rides. IF they are no more than 2-3 hours in length you would be better off to scrap the generator type of lights and get a good rechargable battery type. They are brighter and easier to use. A ten watt halogen will throw a pretty good beam of light.
Of course if you do long rides you may need the generator setup.