Aftermarket Cooling Suggestions for AMDFX8350

As in the title, I have an AMDFX8350 and I've finally gotten sick of the whine from the stock fan.

I'm looking for suggestions, for a general purpose cooler that will lower the noise. Bonus points if it ships with both AMD and Intel brackets, as I may be doing another build in a few months. I'm not Overclocking as this PC is mostly used for programming/vms and as an Audio workstation (which is why the fan is most annoying) with some light gaming.

My case has plenty of clearance inside (CPU Cooler 190mm), for reference: https://www.nzxt.com/products/h630-matte-black

While I do have room for a radiator, I'm trying to stay on Air cooling unless there's a good reason to move to Liquid and the pricing difference isn't terrible.