Looking to upgrade my Surefire M3 to LED



So I have been researching ways to upgrade my Surefire M3 Combat Light to LED. After reading a bunch of threads here at CPF, I've decided on the Lumens Factory P7 head. Seems like a no brainer to me.

During my research, I also started reading about rechargeable batteries. After going through several of the battery FAQs and compatibility posts, I believe what I need for the M3 is a pair of 17000 rechargeables. However, I'm not near as confident in that decision as I was the P7, so I wanted to verify that I would be ok with that combination of LED head and rechargeable batteries.

Thanks in advance. :)