I'd opt for a z170 motherboard and some faster memory. Trade out the msi card for the EVGA 1070SC? I even saw a gaming x today for $340?
Might increase price but depends where you live and retailers you are buying from.
Aftermarket cooler is fine.Stay cool and quiet!