There are Li-Ion-rechargeables available on the market. They are manufactured by TADIRAN, an Israelian weapon manufacturer.
These cells became popular by R/C model airplane pilots because of their high current capabitlity and capacity at light weight.
They are a little bit difficult to charge, as they need a combined I/U charging you will need a special charger. Also you cant charge a battery pack but have to charge every cell on its own...
As far as I know they are made in two sizes: AA and 2/3 AA.
The 2/3 AA would be able to be fit into a surefire...
The AA have about 780 mAh capacity, the 2/3AA about 450.
Discharge currents can go up to 2.5C, which means about 2 Amps for the AA and 1.3 Amps for the 2/3AA.
If you want detailled information, I can get it for you. Just email, or reply.
Bye,