For aviation at least I doubt that hydrogen is going to be viable due to issues with fuel volume, storage, handling, and embrittlement. I expect batteries to be used for short flights and carbon-neutral synthetic kerosene to be used for long flights.