You should get the m.2 version rather than the SATA version of the SSD, saves space as it goes right on the motherboard and also is much faster.
The Samsung 960 EVO is coming out in October as well.
I'd also go with a Hitachi drive, they're still the best IMO and have the lowest
failure rates in long term usage.