I think at this point, I probably will do one of two things:
1) Get the light head and only from Geoman and then get an aftermarket battery pack and a charger.
2) Get a MG P Rocket
XP G R5 from Shiningbeam. I just got one from them and I think it is as good as the P7 and more reliable. Using old 1 year old Trustfire 2500ma 18650, I was able to get 1 hour and 20 minutes of runtime. I have yet to test the runtime with 2900 mah AW 18650, but I am confident it will give me at least 1 1/2 hour. The brightness is slightly less than the P7 but has a better throw and less flood. Best thing is that the switch works flawlessly