[outworlder]

If there's a capacitor... what about adding a switch to allow you to select which battery you are using? Then you can replace whatever you are not using without issue.