From my experience, you are not supposed to hold J1 after you got the waiver. You should have changed to H1 right way.