Elytra unusable in water

Let's say I'm flying over an ocean and I fall into the water, well I hope I brought blocks to pillar up with because you can't fly out of the water in bedrock. On Java this wouldn't be a problem, We need this parity. It's a quality of life minecraft needs, swimming back just isn't fun! I'm not asking to use rockets underwater (I know its a bug) but make it so if your on top of the water you can at least fly away, without having to stand on solid blocks. Not everybody has a riptide trident or lots of blocks on them in these situations.