I cheated and bought a Cateye Powershot Plus. The battery is inbuilt and it charges from a mains adapter. Much smaller and lighter and no additional battery pack to lug around.
http://www.cateye.com/en/product_detail/462
Most importantly, at 15000 candelpower, it's pretty bright for something so small and light!