My bet for carbon-neutral aviation is not batteries, it's synthetic hydrocarbon fuels.
A factory that can make kerosene out of atmospheric carbon and electricity at a reasonable cost seems like a smaller stretch than an exotic new battery with orders of magnitude better energy density.