I would put some money on this. There are very few inherit benefits to gas right now except "faster to refill" and "more range between stops". Both get solved by increasing battery densities, charging speeds, etc. At 300 miles range, I have 1 common trip I need to charge for 5 minutes. At 400 miles range (which I can get on an S), all my common trips are charge free. Vacation trips already work great with 300 miles range.