Must get J-1 waiver

Need to marry the H1 before H1's I-485 approval.
AND need to get J-1 waiver before filing own I-485, or if I-485 accepted in error, still need 212e waiver before the applicant can be approved of the adjustment.