Neither one meets my needs, I'd move on to another vehicle, even if that meant waiting, but that's just me. The OP has different opinions I'm sure or he wouldn't be asking about those two.
If you were forcing me to pick, I'd go with the MY16, and I wouldn't be happy about it...
.02