The fence removal will still be triggered by the 25th aircraft, before the five years from ISL implementation trigger, since the 25th aircraft is due in early 2016.
The deferrals are moving 787-8's from 2017-2018 to 787-10's in 2022, so irrelevant to the fence since the fence will come down 1-2 years before the deferrals.