This https://www.aspistrategist.org.au/future-submarine-coming-up...
gives me 4.5 MJ/L density for fuel
This, just chosen randomly https://www.cei.washington.edu/education/science-of-solar/ba...
Gives me 670 Wh/L as an upper value...and a MJ 277 WH...so 2.4 MJ/L
Unless I'm utterly wrong, I'd just wait for batteries to get better. New Musk investment, 'The Unterseebat Company'