Yeah, the city should step in to fill this role. Perhaps they could pass some sort of law requiring that current oil-based infrastructure has to support batter

Yeah, the city should step in to fill this role. Perhaps they could pass some sort of law requiring that current oil-based infrastructure has to support battery charging as well. Gas stations might be a particularly good target, since they are already geographically optimized for refueling vehicles.