Are you going to overclock? I would most certanly change the PSU to a MUCH better quality one such as the EVGA G2 (best) or EVGA GS. PSU is the most important part in a build. Also if you are not video editing you can downgrade to a i5 and get pretty much the same performance in all games (within 1%-7%). With the PSU and CPU change you will have a computer that can run anything on ultra. A few other changes would be to the SSD but it is not needed totally. The value of the Samsung 850 EVO is much higher (faster, more reliable, and longer lasting) than that of the Crucial MX100.
Once again with the PSU you have picked it is low quality (tier 3 on the tier 2.0 list). I recommend getting a tier 1 or tier 2 unit from this list that is...