Agree with your thoughts. To add - I've taken my Model Y on many roadtrips and have been to many superchargers. A solid number _are_ at restaurants/shops/etc. Some aren't -- but there are so many chargers that usually you can alter the planned route to include a longer charge wherever you want.

Not only will batteries get bigger, but chargers will get faster. Most of my stops now are 10-15min so often there's not really a need for any side-questing. Tesla recently added a supercharger-specific leaderboard for their in-car Mario Kart clone, which is super cool. I think we'll see some growth there for that kind of thing, but the market is obviously much lower than gas stations/etc