They just become convenience stores, which is all they are anyway.

We'd need far fewer of them. Many will transition to also providing charging stations, then, as these can be placed pretty much everywhere without any complicated infrastructure (huge underground gas reservoirs), parking buildings will provide charging services.

99.999% of commuters can do so with a single over night charge. Many will be able to charge their cars at home.