Yes it will fit but order more of them and install the brightest of them...
Tom you have much powerful remake of t20... 3,7A with samsung R...So there is 30 kcd of difference...
For single cell lights I limit myself mostly up to 3A(I know to solder amc but I don't want to raise current) and mostly use Sanyo 2600 or Pana 2900(PF,PD) 18650 so it will hold longer that kcd than your
imo Several factors can influence on throw(this is for guys that are start to build light):
1. Emitter (among same batch of emitters some are bright but some ain't, selection is necessary for best results) I did not believe that until I ordered whole batch of them... Vinz is making selection of them also.
2. Aspheric lenses lottery (they are not all the same, sometimes you will get ultra bright and sometimes ultra blurry one which will decrease throw especially with this UF T20)
3. Copper LED PCB(noctigon, sinkpad)
4. Driver. It is up to you to decide(more current better performance but lower runtime)
5. Battery... (forget on crappy fire ones because they can not deploy more than 2A of current to led, only high quality cells like Pana(all of them but especially NCRPF PD) Bad cell will decrease your lux/kcd performance.
6. switch spring(it is ok on UF T20 but on some lights-even premium lights I got to change thinner springs for thicker, and you can actually get boost of performance for more than 15%? Seriously I am not kidding here and I don't know to explain what is happening in thinner spring but it decreases overall performance.
7. Led to pill heat transfer(put hq thearmal paste/glue under the led star like artic alumina or artic silver 5, flashlight will transfer heat much quicker than with fujik for example- I tried that)
8.Night & weather (you will visually see better in clear weather darker nights without stars or moon)-
- I'm telling this because there are to many people out there that can not figure that out. One costumer/older guy came to test flashlight and it was raining hard... With 180KCD light you could hardly see up to 150 meters(shiny rain drops) but man start yelling on me and telling me that I deceive him, that it can not throw 700 meters like I claimed... He said that flashlight must throw that distance no matter of weather
And I could not convince him that this all happened because of bad weather... He upset me so hard that I am not willing to do any tests if weather is not clear or night dark... Human stupidity is incredible...