Yes I think swapping batteries is a perfectly acceptable solution. It would be no different than changing the tires. I preferred Formula One when they allowed fueling in race.