Electric Vehicles EVs

Taxing EVs makes total sense but I think there are two things that should be changed:

1. Perhaps it's time for an actual road tax - ie upkeep of infrastructure etc. Maybe tolls like France.
   
2. If EVs are being charged VED in the current system - based on emissions - then big petrol and diesel cars should have an equal or greater increase in their taxation; I'd love that to be earmarked for green initiative like solar etc too