If you're sticking with your 1060, you're pretty much capping your performance in games right there. Nothing wrong with that, but much of the performance advantages Intel shows in games become non-existent when the GPU used isn't fast enough to show the difference.
Looking at Gon Freecss's benchmarks, it just shows there is still software out there that isn't very well threaded, and raw single core performance coupled with higher single core clock speeds will make a difference. While those benchmarks may be perfectly accurate, for those particular programs, they are not representative of every workload. It pays to look at benchmarks for the software you intend to run, not just a couple of benchmarks that may or may not have been hand picked to paint a particular CPU company in a particular light.
I think your power supply is cutting things a bit close.
Your hard drives are neither here nor there. If you are happy with them, there's really no reason to throw them away and buy something else.
If I read correctly, you're opting for a SATA based SSD rather than an M.2 based device? I'm not sure why you would prefer the slower interface over the newer, faster one for your primary boot drive. Also, if you're willing to go through a slightly more convoluted setup process, x470 boards get a free license for
AMD's StoreMI software, which basically allows you to use an SSD as a cache drive for your hard drives.
It's been reviewed and shows that it does a really good job in speeding up frequently accessed data stored on hard drives.
Not sure I'm going to be much help picking a motherboard. I usually just recommend you look at the features of each, and pick whichever one meets your needs. I'm partial to Gigabyte myself, if for no other reason than their dual-BIOS feature, making bricked BIOS flashing pretty non-existent, although I will admit they sometimes make some idiotic UEFI / BIOS head scratching design choices.