[Doubtful about Ṭawāf al-Ziyārah]

Answer—and Allah grants success: It is unlikely that a legally responsible person would perform Hajj and not circumambulate the House during the Days of Sacrifice while seeing the people going repeatedly to perform Ṭawāf of the House in those days. And Ṭawāf al-Wadāʿ counts in place of Ṭawāf al-Ziyārah if we suppose that he did not perform Ṭawāf al-Ziyārah.
Moreover, a doubt that has persisted for a long time, as in the question, is not given any weight, for a person does not remember in detail the specifics of what he did twenty years ago.
Source: Min Thimār al-ʿIlm wa al-Ḥikmah vol.1