My thoughts...
If you are merely looking for an illumination tool, skip the 6P since you already have a solarforce, especially if your solar is an 18650 variety. It is nice to own a surefire just for the fanatical fun of it, but as an illumination tool I don't think it will instantly obsolete a solarforce or AA powered fenix. I do not believe the 6P is all that much superior to the L2. IMHO the 18650 L2 is superior to the 6P, with the right high current drop in module. I think the only superiority the 6P has is its bomb-proof switch design, which I think is more durable and reliable than a click-type switch.
The flip side of it is, you will never really know or understand Surefire ownership until you own one and use one on a daily basis. Perhaps the "mystique", aura and fanaticism is something you favor? You'll never know without first hand ownership.
FWIW... I have a 6P and M2 and neither have made my Romisen lights obsolete. I just bought an ultrafire WF-503B and prefer it to my 6P, on the job inspecting Cisco ISP equipment. Despite the overwhelming fan-fare, I have always believed Surefire designs are good at what they do well, and bad at what they don't. I don't think any light, surefire or otherwise is perfect and without flaws... at least I have yet to find one.