Honestly if what im seeing from 607 firmware is right and its moving the ceiling down so you never ever get a full charge and keeps lowering the max capacity of the battery you are better off staying where you are and doing the math on charge/discharge to work out when its going to go kaput. At least on older firmware when I did plan for it I got the full capacity of the battery back whilst it started ticking down.
Im expecting to have no battery to charge within a week and contemplating powering it down via the gateway breaker for when 4pm starts im going to have that little capacity left.