You should be able to get waiver before Oct. next year since you don't need anything in China. You can not extand your DS2019, otherwise you need a new waiver for the new DS2019