The most logical step would be to focus on cleaning up electricity production before we start forcing people to drive dirty EVs on dirty electricity. Move all the subsidies from EVs to research into battery-tech, hydrogen, etc instead for now, until we have something sustainable and then fund that instead in 20 years.