Do you prefer the combat grip style body? Do you think you'll use the pocket clip? Is hard anodization really necessary? If so, then the M2 will be a great light. However, shock isolation can be achieved simply by buying the Z32 bezel and putting it on your current 6P.
I was not aware of the Z32 bezel. I'll definitely have to get one for my shotgun light. Thanks for the info!