Convoy M1 with 18350?

Anyone found a shorty tube for the M1 ever? I think that this may have been asked before, but wondered if in the interim anyone had had the fortune to find something that fits.

Does anyone also have a recommendation for some 18350 batteries in the EU? My set of four Trustfires are dying slowly and I’m looking to replace them fairly soon, hopefully something with a few more AH….

Thanks in advance for any help!

Can’t help with the shorty tube but you can get cells in the EU from this trustworthy site: https://www.nkon.nl/

Thanks Mike!