I guess I wont give suggestions as other members will have better ones fitting the criteria you pointed out.
I will only suggest seeing this site: https://hc-lights.fi/
Other than this, Banggood and Gearbest have good options, and there are some discounts provided by some members here:
Now I see how it works! Actually, my 2nd mod was on a light that has “similar” way of functioning, with mechanical side switch, like yours, and the driver above it.
Here is the thread if you want to take a look (second part of the post #1): My first mods! An experience, for sure!
Being more clear, now, how the light works what I think is that modding it with a good driver and good cells…would be a waste of time, maybe!
You can still do it, with a driver that fits that aluminium pill and that has a spring attached to make contact with the brass pin on the switch.
Also, if you use non high-drain cells, it will not give you much trouble with the mechanical side switch.
But still, the interface of the driver / switch / cells, needed to be worked carefully so that the light could function properly!
As I said, you can make it and it will be a nice experience, believe me!
But if you want a “reliable” flashlight, you will have better “stock” lights out there that will perform better and that will give you less trouble!
Still try to make that mod I started that way as well
If those are “fake” cells (as Lexel mentioned) with fake advertised capacity, they will not hang on for very long times! Also, 2200 mAh cells are far from having great capacity. The 18650 cells with more capacity have around 3500mAh (so there is a big difference, that translates in the runtime they will give you.
About getting hot or not…that driver doesn’t push the LED to the limit, resulting in the low output you are getting. If the driver pushed the LED more it would get hot within few seconds.
A better driver and better cells will give more output and more heat!
I would recommend a Convoy L6, stock light is great and you can upgrade it later on.
You can find great deals on this light with M4DM4X on banggood or gearbest, but you need a separate charger and cells.
The easiest way is to use a replacement driver. Kaidomain sells a lot, or BLF member Lexel his Texas Avenger drivers, but for that you definitely need new cells.
As said earlier, probably you’d be better off buying a decent flashlight.