YES! You need a new waiver, but Advisory Opinion may say no. So apply for an advisory opinion first.
An advisory opinion is a request for a statement from the State Department's Waiver Review Division as to whether someone in J-1 status is subject to the home residency requirement under Section 212(e) of the Immigration and Nationality Act.
Please google it!