I have even better solution. For a couple of million dollars less. Standardize batteries. Make them replaceable. When your battery dies - pop new one. Loan one. You can charge them in bulk. We have been using that with AA for couple of decades with awesome results.
Now can I get my funding please?