I actually believe it would extend to 2017 either way.

The extension happens after the card anniversary date* (in this case May 2016), regardless to when you hit the spending requirement, and therefore it would be extended to 2017 (actually February 2018).

* That is why the card need to be open for at least one cycle after the annual fee is due (at least in theory).