If you're in need get a Motherboard you're going to like for the next few years and drop a Ryzen 3600 in it for now, that will clear your performance issues up in the mean time and its cheap, you can sell it when Zen 3 hits.
Don't give away your (and my) plans we won't be able to sell our 3600s if everyone is getting one now.