I would bet on biodiesel for long distance highway transport, farm equipment, and other heavy industry; and electric in a bewildering array of form factors for short distance urban transport.