If you're looking for what I think is currently the best simple LED setup for the 6P, then my recommendation would be to use a good quality 17670 battery (i.e. AW 17670) and the Dereelight 3SD drop in module which you can get more info on from the following link...
http://www.dereelight.com/drop-in-modules.htm
This particular Dereelight LED module is super bright, offers 3 stages of light output with a nice spread between stages, uses the Cree Q5 LED (WC bin), has mode memory so you're not stuck having to cycle through all the modes every time the light is turned on, is a constant current constant output design with very good regulation, has over discharge protection, efficiency is optimized for the 17670 and 18650 batteries, etc. There are plenty of P60 drop-in modules to choose from through many different sources, but there are none that I know of that offer all these features in addition to driving the LED at 1.2 amps on high. Dereelight also has a very good reputation here on CPF with fast shipping, excellent tech support via PM through CPFMP with a quick response to questions, etc, and these things certainly ad up when I'm choosing products that I intend to purchase as opposed to simply looking at price.
You can use a battery charger like the ~$16 Ultrafire WF139 to charge different popular lithium batteries ranging from 14500 to the 18670 (including the 17670). Make sure to buy the optional DC adapter with this charger if you ever plan to charge batteries in your car, motor home, etc.
The 17670 simply slides into your stock 6P tube without any other modifications and offers you the highest capacity (~1600mah) in a single sized rechargeable battery for your stock tube. You can get more capacity from using two 17500's, but I prefer the simple single cell configurations and also prefer a light that's optimized for the lower voltage of single cell batteries.
If you want to take the battery capacity of your light to an even higher level, you'll need to have your 6P tube properly bored out with a lathe to accept a slightly fatter battery, the 18650 (i.e. Tenergy 2600mah 18650, or the AW 2200mah, or the LG 2600mah).
You can also buy a new tube from lighthound.com that's made by "Leef" which accepts the Surefire 6P head and tail cap and supports the 18650 battery, but this option often costs significantly more than having your 6P tube bored out. I've seen where other members here on CPF have paid ~$15 to have their 6P tubes bored, so this option is more cost effective. If you have your 6P tube bored out to 18.4mm, your light will be able to accept most brands of 18650 batteries and there will be *plenty* of meat left in the tube so that you're not impacting its structural integrity by much. I would not recommend grinding out the tube yourself or sanding it out with sand paper wrapped around a wooden dowel, etc. I know some people have done it, but none of these methods will give you the precision uniform factory looking results that you can achieve with a lathe.
Too maintain the versatility of your 6P so that it can still use the factory P60 and many other modules that require the use of a large negative contact spring, the 6P tube should only be bored out at 18.4mm up to about ~77mm from the end of the tail cap threads. This should leave about ~4mm of the original bore left towards the front of the light so the negative contact spring (the large spring) has plenty of material to rest against. This is yet another reason why a precision tool such as a lathe should be used instead of grinding with a Dremel tool or sanding with a wooden dowel, etc.