Princeton Tec Solo upgrade?

Well, after throwing the ArcMania (s?)mjled upgrade into my 2AA minimag I want to upgrade my headlamp also. Its a Princeton Tec Solo (2AA, twist on/off, waterproof) and I would like enough output to be able to bike some mild trails at night. I figure the bare minimum output would be on-par with my MJ minimag. Right now I've only found the [URL="http://www.lighthound.com/index.asp?PageAction=VIEWPROD&ProdID=1768]ArcMania SMJLED Pr-base upgrade"]ArcMania SMJLED Pr-base upgrade[/url]; not 100% sure this will fit, though. Can anybody confirm? I also have a "CCC" 1 watt luxeon headlamp coming off ebay that I am curious about, but if anybody has any good (economic) suggestions, I'm all ears. Waterproofness is a major plus as I spend a lot of time on the water as well.