After 5yrs with my 4790K i think its time to upgrade.

This is what im thinking right now
Ryzen 7 3700X
X570 (undecided on brand)
16GB 3200Mhz or higher
Any money left will go for an NVMe

Any suggestions or comments?

Hopefully Cyber Monday sales will be in my favor