Maglites own upgrade actually seems to be the best and brightest choice for a 2D. More choices when it comes to 3D. And all the upgrades I've seen makes the light maintain it's focusable beam, so for better or worse, that's what you get.
Kul att se fler svenskar här, verkar vara ganska många ändå.
I have a 2C with the Mag LED drop-in, and it's pretty nice. If you want to cast out the center throw a bit, you can frost the lens (either with sandpaper or a PDA screen saver).