Get a Ryzen 5 1600 to get the Wraith Spire cooler, it's significantly better than what came with the Phenom IIs.

Gigabyte GA-AB350M-Gaming 3 is a mATX rather than full ATX, but it has 4 RAM slots...