You are ignoring the second variable on the consumption of energy dense materials. Weight.

It correlates to the energy density of course, but, weight directly goes into the power consumption calculations for vehicles. Efficiency is just a multiplier afterwards.

You can only ignore weight in non-mobile battery applications, i.e. grid applications.

It is a multi-variate problem and petrol currently wins out by a wide margin.