Elytra Location Reset

It is annoying to loose elytra. Example 1: When you are either flying around in overworld far away from spawn location then die, and then when you get to where you died there is no inventory items you had, as they have been lost forever as they despawn. Example 2: Wondering around in the End and an Enderman send you flying off the edge with no way back up to the islands and you die. My proposal is either that the Elytra Locations reset after an amount of time or if during play the Elytra is lost like falling in void in end or into lava.... The reset would include fixing broken structure (broken by player) in end City and bringing schulkers back to life...