The weight cap isn’t ever going away, sure it may go up but you still back yourself into the same problem. For the same amount of energy, batteries will always be bigger and heavier than diesel.
The engineers working on those finer details you’ve easily dismissed are well aware of this problem hence the Fuel Cell…