If you need an SSD upgrade, I can recommend the Samsung 850 Evo. Best Buy currently sells up to the 1 TB version and should hopefully start carrying the new 2TB version soon.
For a traditional HDD, I'd go with a Western Digitial HDD. All versions are good.