So I jumped on a pretty good deal at Micro Center, $159.99 for a Ryzen 5 3600x and $169.99 for X570 Aorus Elite Wifi.
I handed down to my little brother; my old CPU and motherboard with the AIO cooler and 250gb nvme SSD with the OS on it.
More of a side grade for myself coming from a 7700k, but a bigger upgrade for my brother, who will be moving on from a 4790.
I used the stock cooler for a few days before deciding to go with a Noctua NH-D15s. I swapped out the brown and tan fan with some chromax fans and put on some white chromax covers on the heatsink. I switched out my stock case fans with some Noctuas for better airflow.
I switched out my 16gb Corsair pro rgb ram 3000mhz to a kit of 16gb G.skill Trident Z neo 3600mhz for better clearance with the 2nd cpu fan and to get that 3600mhz sweet spot for ryzen. I will likely be done with upgrades to this build for a while.