The build I gave you has the option to be overclocked. As far as the SSD goes, I promise you, after you have one, you will never go back to running your OS from a standard HDD. It's the best upgrade you can make to any PC.
http://overclocking.guide/gigabyte-z170-non-k-overclocking-guide/