TBH I'd just go with efests. Easy to get on ebay and have delivered in a day or two in the UK.
Go for the 3100's for longer runtime or the 30A 2500's if not (do you need button top ones?).
The forward end of the TM06 has a raised button for the two positive contacts, and two coiled springs for the negative contacts. The tail cap contacts have the two coiled springs for the negative contacts and two flat locations on the printed circuit board for the positive contacts.
You either need button top cells or a means of creating a raised contact on the circuit board. Vinh has mentioned that on a few of the TM06 lights he has used a blob of solder to make a raised contact. It works.
I found that soldering the magnets in place on the tail cap allowed for a larger contact area for using flat topped batteries.
The Panasonic 18650BE cell besides being a supposed safer chemistry are rated @ 3200mAh and rated for a 10 amp constant discharge.