Both are correct! The 1st one can be used when being late, you can say things like: "Why were you late again? Did you wait too long for a taxi?" and as for the 2nd one you can say "Oh, have you waited too long for a taxi? Here have mine" It all depends on what you are using it in. but yes, you are correct!!!