What must be done now after forgetting to make up for a shortcoming in Hajj for two years, and does this invalidate the marriage contract?

You must now shorten your hair; nothing else is required of you, because you have performed all the rites of Hajj except the shortening. This delay, due to ignorance or forgetfulness, does not entail any penalty, and by doing so, you rectify your intention to complete the Hajj. The marriage contract is valid, because omitting the shaving/shortening does not prevent the permissibility of all prohibitions of ihram except intercourse.