Update, swapped the 3600 into my desktop and the 2700x into the S4, temps are better. I did however, find out I had a faulty MB, I bought a Aorus x570i to replace the B450 and now all is well, temps are still a little high but staying consistent 85 and below under load.