I wouldn't say you would really count battery discharge efficiency, usually a batteries energy density will be how much useful energy you get out on discharge s

I wouldn't say you would really count battery discharge efficiency, usually a batteries energy density will be how much useful energy you get out on discharge so it already accounts for charge/discharge efficiency. Same with electrical generation with generators or whatever. One of the best things about BEV even if run off fossil fuels is that power plants don't care to much about space or weight, they can do multiple levels of heat recovery and whatever emissions controls and get higher thermal efficiency with lower emissions and all that complicated gear is not being carried around in your car nor maintained by you. On top of that now you are decoupled from energy source so changing fuel oil to natural gas or mixing solar, wind or nuclear doesn't change your vehicle.