Thanks for the info guys. I'm probs gonna go for the 5800X3D when I can. I also found out that my asrock b450m S L board, once updated for the 5800X3D will still support the 2000 series if I ever need to pop it back in for whatever reason.
I can only get one at a time though so the question now is what would you upgrade first, the GPU or the CPU?