I have a Supernova E3 Pro on my Raleigh Sports commuter and couldn't be happier. It works with all types of dynamos including my vintage Sturmey dynamo hub and more modern Busch & Muller Dymotec S6 - you could replace both your lights. I added some quick connectors similar to the ones on a Minewt so that I can easily remove the light.

Peter White sells the latest E3 Pro with 370 lumen with both types of lenses:

http://www.peterwhitecycles.com/supernova.asp

http://www.supernova-lights.com/en/

Paul