For sure the continuation of the current range of seriously dull cars won't be supported, but I don't see why the Classic Movement won't expand to cover worthy more modern cars.
In respect of EVs, at present there's a total failure on all levels to recognise affordability issues, and accessibility issues for home charging. Petrol & diesel may not be as widely available as now, but that's been a trend for years.
2030 is still eight years away and nothing evolves as predicted anyway.