U can go back to China and stay for another 6 months. That will make you fullfil the 2 year physical presence in China in total. Then you are all set. No need for a J1 waiver.