If you're primarily gaming and at 1080p I'd definitely hold off on Ryzen until at least the 6c/12t chips come out. By then Windows will be patched to fix the SMT issues and motherboard BIOSs will have matured a lot to improve stability and performance. Better to make a decision at that point.
It does make sense to wait it out. Just wanted to do something this upcoming week as I have the week of work. I'm like a child when I get something in my head lol.