Is what was done regarding the repeating of Tawaf Al-Ifadah and Sa'i of Hajj and Tawaf Al-Wada' for the previous Hajj, and paying two fidyas, considered correct?

What you both did is generally correct. Sheikh Ibn Uthaymeen was asked about a pilgrim who had omitted the Sa'i seven years prior to the time of the question. He replied: "What I believe is that he must go to Makkah, perform an Umrah by circumambulating (tawaf), performing the Sa'i, and shortening his hair. Then he should perform the original Sa'i that was omitted, because it remains a debt upon him."

However, there are matters that need clarification: 1. You were not required to repeat the Tawaf al-Ifadah as you had already performed it during your previous Hajj. What was required was to perform the Sa'i after a valid tawaf, even if it was a voluntary one. 2. Your omission of the Farewell Tawaf after your previous Hajj necessitated a dam (sacrificial offering) for each of you. This dam is not waived by repeating it during your current Hajj, as it became an obligation upon you. 3. If sexual intercourse occurred before the Sa'i, it would also necessitate a dam, because sexual intercourse is not permissible until after the second tahallul (release from pilgrim's state), and the second tahallul does not occur until after the tawaf and Sa'i.