I'am more and more convinced I will soon need a SF L2, but in the meantime....

I have, in some forgotten drawer, a 2-D Maglite I was about to give away or sell on Ebay.
What I don't like about it :
1) uneven light beam, with "black rings"
2) too heavy, too big, too cumbersome for backpacking or EDC
3) delicate bulb (same pb with SF 6P or G2)


If I could convert it, it would still be heavy (but that's not a pb if it's for home/car use + could be useful as a club).
But what about the "eveness" of the beam ? Is that pb solved with a LEDCorp Epion or a TerraLux Magstar 2 (found on http://www.pocketlights.com/) ???


TIA