Praise be to Allah.
I put this question to our shaykh, ‘Abd ar-Rahmaan al-Barraak (may Allah preserve him), and he replied:
He has to repeat his marriage contract. As for his failing to do sa‘i, it is sufficient for him to offer a fidyah (a sacrifice) for each sa‘i that he omitted to do.
And Allah knows best.