Exactly what I was going to suggest. 
Thanks guys I will give it a look. Anyone else feel free to post your suggestions.
+2.
If you want more throw, the Astrolux C8 is worth a look. It is a Convoy C8 clone with the driver from a BLF A6.
I don’t have one but I do use a C8 with the A6 driver.
I like the Sofirn SF36, though it's not as cheap as it was when I got mine.
I like my Sofurn C8T as an allrounder close range torch.
Plus the new C8+ from Convoy with XPL-Hi
looks nice too. Have one on order.
Personally, I have 2 x S2 (S2/S2+) never use them. I find them
Not so comfortable in hand compared to the C8.
and a Sky-Ray S-R5 is nice in hand too. (The nicest of all I think.)
If you’re a CRI snob (not that there’s anything wrong with that), but don’t want to build one yourself, the Jaxman M8 is pretty similar in size to your X6, and the Jaxman E2 is a nice light. For a few more dollars, I find myself carrying my E2L more often, but they’re all good, simple, solid, inexpensive EDC lights. Yes, I own all three, and no, I don’t have a problem. I can quit any time I want.
My son has gotten good use out of his E3 / eneloop combo in the machine shop.
Both the BLF A6 and Astrolux C8 are $19.99 at Banggood at the moment.
My main go-to is the Convoy M1. Seriously, now I understand the long-running hype about the “P60 module” form factor, it has excellent balance of spill and spot. I also use other lights for fun or smaller size, but when it comes to serious use, I fetch the M1 first.
Not sure how the beam pattern would measure up against the X6; what I do know is that you may be able to nab one from Simon for less than US$20 with the BLF member discount.
Emisar D4 with LED tint of your choice.
Get the 18350 body, just to have and buy the pocket clip.
Small enough not to be intrusive in the pocket, more of a flooder, but throws a bit due to sheer horsepower, $35 shipped, plus another $8 for the extras.
Chris
Get one with a proper constant current driver.
Sofirn SP32A 2.0
Uses a constant current buck driver, has a good UI, and has very nice finish along with very nice looking anodizing ranging from black to champagne like.
Astrolux S41, 4 * Nichia 219B
Beautiful flood
agreed, I use mine in the 18350 format exclusively. Very easy to pocket and use. I prefer Anduril FW installed, but the original FW is not bad.
Thanks for the links - makes things easier to check out! That Jaxman E2L was interesting to look at, but I think I'm going to save my resources for the upcoming FW3A triple-LED 18650 flashlight.
I can also recommend the BLF A6 (non-anodized version in particular because I'm sick of black flashlights). I think all three tints available with the A6 are worth owning. If you are patient, you can pick one up for under $18 US through the "BangGood. Deals" forum thread.
With 18350, always in pocket or within reach. Mine’s a later issue with 219C
BLF A6 3D 18650 in my backpack
Convoy M1 best balance between, throw and flood still fits in a pocket, perfect for daily use…
The M1 is a good choice, but I prefer the BLF A6 because it has a better LED ( more lumens), a better UI (more optiions) and a better driver (with FET direct drive), and can be had for under $20 on sale. Both have an OP reflector that provides a good balance between throw and flood. Just my opinion.
The A6 is better compared to the S2 or S2+, after all it’s a tube light. The M1 is a “P60 host”, with a wider head and larger reflector that gives it better throw than a tube light, be it OP or SMO.
A better comparison for the M1 would be, as I mentioned before, the X6.
(Also you can get the M1 with other firmwares, like mine has Biscotti.)
I have a blf A6 driver in my M1 