I still think the rechargable systems are great if used as a daily light. I keep my rechargable 6P on my nightstand, recharge it about every 3 weeks or so and use it whenever I need to. The lithium batteries are too expensive IMHO to use as a casual flashlight.
I think you will have excellent response from SureFire. I purchased an additional module for the rechargable system for my old 6P. They had redesigned the body of the light and when I contacted them they sent me 2 brand new bodies for my 6P's for Free.
I carry a 6P with 120 lumen lamp on my belt everyday, but only use it if I have to. This is my fully charged building evacuation light so I would not rely on rechargables for it. I also carry 2 replacement lithiums and an E2 SureFire with 60 lumen lamp and a Streamlight Stylus. The Stylus is my everday-under-the-desk-where-did-it-go-hooking-up-wires-man-it-is-messy-under-here light. The other two are for assisting me and others in getting out of this 1914 brick earthquake trap.
Let us know how SureFire does for international customers.