I am in similar situation, J-1 in china more than 2 years and I140 appoval. Some lawer said my J-2 waiver is ok because I stayed one year and half in china and was issued H1B visa in china. Did you go back china and where did you apply for your H1B ? I am not sure about your situation.