Op -

you might try reading this article by the randonneurs. those guys know all about riding in the dark for nights on end. the consensus is to use a generator powered light. sometimes more expensive but worth it.

http://www.randonneursontario.ca/tech/trlights.html