"If this continue I'll go with amd and buy the rx580 or even rx vega 56 to save money"
Yes you should.....if the price is right.
Personally, I think waiting is the best option, but it will be a few months (2-3 at least) before you'll find a good deal.
Nvidia is scheduled to release its new series of flagship card in mid-april. By that I mean a GTX 2080 (name might be different).
They also promised to do something about the gpu shortage.
Rumor has it, that they want to divide the market in order to alleviate some of the pressure from gaming cards, by giving miners exactly what they want: Cards that are best suited for mining
https://www.digitaltrends.com/computing/nvidia-turing-ampere-graphics-cards-gtc-2018/
I sincerely hope that AMD follows in and does as Nvidia does, because if they dont, they are not only screwed, but us consumers are screwed as well.