please help: j-2 waiver

本人J2 轉F1，then H1, I140 was approved, waiting for ting Form 485. My hus(J1) is currently in China for his 2 year physical resicence.

I just got that J2 has to apply for waiver if he/she applies for Green Card even if J1 has finished 2-year physican home country residence.
So, I am going to apply for J2 waiver. 請大夥兒幫幫看，下麵的步驟是否可行：

Way 1: J1兩年回國期滿， 回到美國後， 再次申請豁免， 帶上j-2， 這樣J2就豁免了。

Way 2: J-2 按照J1豁免步驟申請豁免.

Which way is easier? Beofore I call Chinese Embassy, I want to hear comments for all of you.

Many thanks in advance