Yeah. Back in say the 90s when you were custom building it was generally a good rule of thumb to go with after market coolers since the ones you got stock were ****. These days it is expected that your CPU and GPU be well maintained with stock coolers. Since I went with a Xeon over an i7 due to its similar performance at a lower price point that denied me over clocking my CPU I just stuck with the stock fan and even though my office can often get hotter than it is outside in this California heat there has never been an issue with any of my components getting even slightly near too hot.
Just make sure you apply the thermal paste properly.
I like the Samsung EVO personally. I found it was difficult when I was putting together my office machines because it wasn’t as clear cut with regards to available information comparing SSDs. Eventually I found various benchmark speed testing and charts listing SSD speeds relative to one another and the EVO was near the top (no I"m not going to spend an hour going to look for that stuff again, all on you if you want to delve into comparisons). But my suggestion is to stick with the EVO. Though on a relevant note, that speed might be slightly more important for me as I chose to eschew HDD and go only two 500 GB SSD.