I have an M107 , 3 yrs old .
It's def. my daily driver , and desk top too for water vaping .
Recharged overnight , and I too will be needing to exchange battery . It's down to 90 minutes portable power ,straight usage.
The heater still working fine , but maybe not as optimum as my
new one .