https://en.wikipedia.org/wiki/Energy_subsidies#United_States
"""
Renewable energy: $7.3 billion (45 percent)
Energy efficiency: $4.8 billion (29 percent)
Fossil fuels: $3.2 billion (20 percent)
Nuclear energy: $1.1 billion (7 percent)
"""
I'm going to guess it will be a mix of both, but the govt(s) will be slow to do either, until they realize, too late, that they didn't meet their income goals on fuel taxes last year and suddenly have a shortfall in the budget :)
I suspect most states/countries will eventually adopt a combination of higher annual registration fees and mileage-based road user charges.
As for the charging @ home vs a supercharger(and the like) I agree with you, but the government is not known for always being wise or letting facts get in the way of something they want to do :) They understand a "Gas tax", so including EV chargers as part of the gas tax is easy to understand and easy to approve.
Also it's likely to be evened out by someone who's registered in Idaho, but is driving in Washington. And in any case, the taxes can be adjusted to account for a fraction of cases like that.
This is also more fair than fuel taxes because low-efficiency vehicles aren't necessarily doing more road damage.
Perhaps not for you, but it sure did[1]
[1]https://en.wikipedia.org/wiki/General_Motors_Chapter_11_reor...