Why do we rely on the Chinese, there a battery manufacturers out there who make very good, consistent batteries. They are not more expensive, because they last and there is quality controll. If I look how many batties I already ditched!. To give an example here are some models from a very reliable battery manufacturer:
Lithium Cylindrical - Data by Technology - VARTA Microbattery Corporate Website
sure they are different sizes then what we have now, but who cares. The mod is as good as it's weakest part!!
We should make a list with suppliers and what experience people had with them, that will help a little and at the end of the day Imeo will just change the diameter and everything will be solved and we will all be happy again ;-)