I would opt for the 2015 MacBook Pro with 16GB RAM (useful to have as much as possible), especially if you need some legacy ports (SDXC, HDMI, Thunderbolt, USB3) and MagSafe that the new MacBook Pro doesn't have. Of course you can always buy dongles for the 2016 rMBP.