If you're just looking for a great light solution for your Gen 2, I have a great setup with a custom bracket I am getting ready to market. It includes two 900 lumen P7 lights, 4 LIon rechargeable batteries, a charger, bracket and mounting hardware for $199.00. I guarantee this is substantially brighter than any bicycle light setup and costs a fraction. The bracket mounts to the leansteer height adjust screw and easily mounted and dismounted in a matter of seconds.
Here's some pictures to give you an idea of how bright they are. PM me if you're interested!
http://www.flickr.com/photos/2023665...7615745412898/