I can replace my current mid-2012 Macbook Pro (non-retina) through work. Currently I have 8GB and a 256 SSD installed. I rarely do some audio or picture editing. No video editing. I'd like more storage. I don't think I run into memory problems but I don't know what the OS will require to run optimally in 2-3 years. I can spend up to $2k. With employee discount the 512GB SSD and 16GB RAM comes to $2005.83 after tax. So it's one or the other. Which would you choose?