Remarried same spouse

Hello all . I need advice from the experts only please.
I'm here in USA as conditional green card . me and my wife our marriage didn't worknout for some reason ( because we were living with my mother in law house and she is very abusive and she didn't like me at all ) I got annulment decree based on my wife mental illness ( bipolar) and on the annulment decree saying that (the marriage happend in good faith but it have to be anull because my wife mental illness at the time of the marriage) now we thinking to getting back together again and remarriage again. My Question is what I'm gonna do with the i751 ?apply joint or with waiver ? And in case of waiver and my application get denied what we have to do ?apply again with i130 or what ?I'm really confused and i don't know what to do .