I gave reference on my experiences with the malfunction software of the i3 and suggested better software or / and more dashboard info on temperature control. If the battery does not get so hot, the problem will also be solved.
Checked on the internet whether there are already battery products...