I am planing to get a new Macbook Pro 15 inches to replace my MBP 2011. I gotta two candidates with a similar price (2800 $): (1) A custom-tailored Macbook Pro 15 inch (late 2016), Six-Gen Core i7 quad (2.9-3.8 GHz), 2TB SSD, Radeon Pro 455. (2) Macbook Pro 15 inch (Mid 2017), Seven-Gen Core i7 quad (2.9-3.9 GHz), 512 GB SSD, Radeon Pro 560. I do wanna get a MBP with the largest SSD, but the cost for the update the SSD of 2017 MBP to from 512 GB to 2TB is more than 1200 $, really a lot!! But 2017 MBP do have some new features in CPU and GPU. What you guys suggestions?