Increased gas taxes would drive behavior change towards electrics. Similar to tobacco and alcohol taxes to discourage their use.
I don't see diesel going away so soon though because of industrial, agriculture, and military use. It will probably be taxed differently according to it's use. In fact it already is taxed differently in the US for home heating, vehicle, and aviation use.