Best of both worlds would be getting rid of the currents since they are ultimately pointless, but still locking flight behind some final events of a zone. The part where you have to beat feet and get to know the layout of things directly is important, even if you'll spend the vast majority of your time flying over it all later.