You are welcome.
I am in the same exact situation in that I am waiting to see what AMD comes with.
I am building a new PC, that is I am putting together a shopping list only the GPU is missing as I want to see the AMD offering - hopefully sometime in Q1.
Then I will choose the GPU and also go with what CPU + motherboard combo that is most appealing.
Only thing nailed down so far is case, PSU and secondary storage as I will carry that over. Likely also my Noctua CPU cooler as they offer a free CPU mount so I can reuse my current cooler.