The KD C8 uses XM-L emitter which I find better than P7. I'm not sure it would be worth upgrading from your MS. When it dies get a C8 with a couple of 18650s and a charger. Cost is less than $50. Lumens? Probably about 600-700. I only use 18650 torches for headlights.