Thanks Guy's. The ones I have are from Battery Junction, and they are cheap, but the terminals are recessed, which sucks.
Just to provide my feedback, having had two of these lights for a while now. I actually think I prefer the U-15 form a little better. The extra length is not that much, in fact it makes it fit in the back pocket a bit better, and the longer run time, and 18650 batteries are preferred.
The light just feels a little more balanced with the large head. I still love my T-15's, but given a choice in the future, I would probably go with the longer light.
Of course my T-15's were Free, so you can't beat that. I am still waiting for Javier to send me a bill.