I just thought of this. Seidio made some batteries that contain more energy then the regular BB Storm battery (its not in the cb store...) but it is listed under the site. I have not bought one, but I think if they even added even half a millimeter of extra plastic, it could fix most clicking issues. This is especially so with the overlarge battery that can last three days of abuse.