fun fact I learned tonight: you can press Q again while diving to STOP THE DIVE. So if you don't want to go all the way back, you don't have to. Just press Q again. It's a helluva escape/re-positioning tool. Based on the tooltip, I assumed you could only stop the return flight of the dive if you ulted. Was pleasantly surprised to find this was not so.
Super useful information. That should make things a bit easier.