You are better off going with Ryzen unless you already bought the motherboard which in that case RIP.
This is my build I spent a lot on it cause I cheapped out on good parts the first build I did and wanted my
stuff to last a couple of years with out upgrading.