In CA, you can request a status only judgement after 6 month, so you will be able to get married legally again. And those disputed issues are left to be resolved later.