The XinTD X3 or Convoy X3 is a very robust flashlight with good flexibilit 18650/26650/3x AA.
A closer match to your P7 would probably be a Convoy C8.
Both x3 and C8 have very good quality for the price and around 900lms.
if you want a step up in brightness you might consider the BLF A6. It's a tube light with upwards of 1300lm. Doesn't get better size to lumen ratio than that in a stock light.
M4D M4X states in his review that a protected Keeppower battery worked fine.
However, I’d recommend you use a high drain battery:
Personally, I’m using a couple of average batteries (Radio Shack) in my JM35, because I have the 2x26650 version. However, I’ve had good luck using Keeppower IMR 18650 batteries in other flashlights. So, I’m fairly confident in recommending the Keeppower IMR 26650 cells.
For the BLF A6
A lot of the BLF members have been going with the Samsung 30Q high drain batteries for their A6.
But you could use any one of the recommendations for protected and unprotected cells listed here: blf a6 battery
I’ve got three BLF A6’s and have been using both the Keeppower IMR and the Samsung 30Q cells in them. I haven’t noticed any drop-off or difference between them.
I would suggest sending M4D M4X a PM asking for any discount codes, before making any purchases.
EDIT: The EVVA 26650 battery that unknown00101 recommended is a high quality battery rated at 15.0A and should work fine. However, the narrative description suggests that you might want to think about a higher drain battery for 4A draws or higher. M4D M4X’s review states the JM35 MT-G2 drew 5.3A. So, you might see some slight improvement by using a higher drain cell such as the Keeppower IMR.
AFAIK, BudgetLightForum A6 = BudgetLightForum Special Edition A6.
There are two versions of the BLF A6: anodized and bare aluminum. Each version coming with a choice of three tints (1A, 3D, 5A). However, they are not differentiated by being designated as BLF A6 or BLF A6 SE or BLF SE A6. Nor should they be, since they are exactly the same flashlights (other than the coating).
And there is the Astrolux S-1 (same flashlight, but under different branding), that comes in only the anodized version.
BTW, I agree with Ronin42’s assertion as to the BLF X5/X6 group buy being the best value (biggest bang for the buck). However, the delivery date is indeterminate. IMO, they are not true EDC’s in the sense of being tailored for general everyday use. However, their beam pattern and the X6’s form factor is much closer to your SSC-P7. So, they may better meet your expectations - especially the X6.
I just ordered the A6 with the 5A bin, I know it’s very different from my SSC-P7 tint but I think it’s a better tint choice. Maybe later I’ll get another one with cooler tint.
+1
Or the BLF A6 was still available but no cheaper and without the short tube, last I noticed. (I recently ordered a bare metal one.)
Or put a BLF A6 driver from Mountain Electronics or from Banggood in a convoy.
Or put a Nichia 219C and 12 x 7135 in a Convoy.
Or if you only need high mode, take out the driver of a Convoy, or out of an SK68 with an XM-L or an XM-L2.