J2 does not need to do any waiver, can go to H1 straight with greencard processing as soon as h1 is approved. The j1 spouse however has to do the waiver n there is no way around for him/her. Not a lawyer, but this is almost sure.