Rezafo, I don't have anything to add to the grammar here, because I really am the pits at conditionals and these other finer points of grammar.
But I wanted to post because I wanted to commend you on your diligent study of the language. You are looking at really fine points of language and you are getting it. Even native speakers don't always agree with each other and it's not surprising there is disagreement wiht a few things your teacher has said), it sounds like you've got a great teacher who is helping you be enthusiastic in your studies.
(I would probably have said it like this: "And I sat there, wishing it would end soon." It wasn't a fleeting wish -- it was ongoing. I feel that way in a lot of meetings. I don't hope they will end soon; I know they won't. I just wish, for about half the time I'm there, that they WOULD end soon.)
Retired English Teacher