Both the Hebrew yayin and the Greek oinos can be either fermented or unfermented grape juice, depending on the context. Obviously Noah got drunk on fermented wine. There is no argument there.
It is also obvious what Jesus meant here:
Matthew 26:29 But I say unto you, I will not drink henceforth of this fruit of the vine, until that day when I drink it new with you in my Father's kingdom.
He was speaking of juice--the fruit of the vine; not something that had gone through a process. The context gives the meaning of the word.
It is similar to our English word "cider." I can buy "cider" at Second Cup, a coffee outlet. There is a cup of hot apple juice. Nothing fermented about it. I once visited Germany. At a cafe they advertised "cider." I almost had some, but then realized that their "cider," was fermented, an alcoholic beverage, so I stayed away from it.
Our English word "cider" can mean either fermented or unfermented, just like the word "wine" did in the 17th century, and just like the Hebrew yayin and the Greek oinos do. Only the context will give the meaning of the word.