Maybe Warp is meant to be the one used in instances, since it's really obnoxious to come out of an instance and have Return still on cooldown. I wouldn't mind if they made it so Warp replaces Return in that way.