Well, why not just buy an extra battery when you buy the bike, and take it with you when you may need it? I bet they'd cut you a deal on it if you reached out to them before buying a bike.

As an owner, the one thing I'd change would be to give it a couple more gears. It doesn't need the full 7 or 8. Just three would be good and would let it stay "lite": A hill climbing gear for maybe 5 or 8 mph, the current 15 mph gear and a top speed 20 mph gear. No one makes that kind of cassette though.

...or maybe a higher-end model with a Bafang mid drive with Gates carbon belt drive and a 3 speed IGH? Make it maybe $1200 and call it the XP Lite Premium.