Yes, I think it's correct, but I have some problems with the subjuntivo. I would take condicional in this case, because there is a possibility that he would have waited, if...
Because the English language doesn't know a subjuntivo it must be correct.