Flying is sadly too powerful a tool, working around it is impossible without removing it completely. What flying really needs is a complete rework so it doesn't completely undermine all other movement options. Ground mounts still need to be better than flying at some points, same with flight points.
It's unlikely this will happen though, but it's nice to dream.