Hi George
You are absolutely correct with your calculations! However the one thing you did not consider is that the specific energy or kWh/kg increases not the kWh/l or energy density.
Your conclusion is correct considering that the core materials must be the same.
However consider the fact...