You did not mention some important info, like where you live, if your rides involve hills, heaving a heavy bike up stairs, etc.
You might look into a Swytch Max conversion to use on your Dahon. About $700 with a spare battery. Adds under ten pounds total.
They would send you a second charger with the extra battery. You could keep that charger at work.