This is what I would reccommend for your older minimag incans.
http://www.batteryjunction.com/tle-5k2.html
I second the TLE-5EX, I have one myself. If you get it I highly recommend doing the "washer mod" in which you cut off approx 1mm of the leads of the 5EX, take the "switch" out off the minimag (the plastic part with 2 legs that says DO NOT REMOVE on it).
Then put a washer in between the 5EX and the body of the minimag so the heat transfers directly to the body of the minimag. I arctic alumina'd the washer to the module.
This takes the twisty functionality out of the minimag, thus requiring you to have a tailcap clickie , for which I recommend the Kroll switch from The Sandwich Shoppe.