I'd say remove the intel SSD, and get a 850 EVO.
I know that people are saying that you can get a intel based platform, but this is a build with canadian prices. I know that it translates to higher prices and this build also has many peripherals. If you can up your budget then go with a intel build.
PCPartPicker part list / Price breakdown by merchant