You will need the waiver as you have said. Read the instructions on Form I-751. What you will be required to prove is that the marriage, when entered into, was in good faith and not to get a green card.