I think convenience stores will go through quite a huge change in the next 20 years. Small mom and pop gas stations without much of a "store" to speak of will probably disappear entirely.
Gas stations around here sell anything from the usual cigaretter, pop & snacks to really good "home made" food. I can think of one that had a small, very good, Mexican restaurant in the back and another that made gyros, falafel, etc. to order. I would go out of my way to stop at those.
But gas only? I simply can't remember seeing one in the last 10 years. The closest is the ones that are service stations that happen to have a few gas pumps.
I charge my electric car in my house everyday. I don't think about that. Way more convenient that going to the gas station.