Since cars have a 10-20 year lifespan, and electric is becoming superior, that will probably solve itself over the next 10-20 years (maybe they'll be EV powered by natural gas for a while, but that's still a win, and then the grid might get greener.)
Aviation fuel is the highest and best use of hydrocarbons (along with some chemical production), so we can deal with that last, after lots of power generation, demand reduction/efficiency, etc