What should also be done is looking at how the transport infrastructure should be shaped for the future. I think it is plausible that we will see a scenario with much more rail transport, with the final leg being performed by relatively small electric trucks with a limited autonomous range (but also by for instance coopting tramways in cities).
Building big new highways (as Zapatero is doing) will mainly favour mule power...