You seem to be on the right track…
A Commentary on the New Testament (The Catholic Bibical Association, 1942), on page 199, says in part:
Although Christ is soon to deprive His disciple of His visible presence by His ascension into heaven, still, He remains with them in an invisible manner both by His presence in the Holy Eucharist and by the presence of the Holy Spirit, who is “the Spirit of Christ” (Romans 8:9).
Haydock’s Catholic Bible commentary, 1859 edition, on Matthew 28:20, says:
Ver. 20. Behold I am with you all days, even to the end of the world, embraces two points necessary for the Church; viz.
integrity of doctrine, and
sanctity of life; for, if either of these should be wanting to the Church, it might then be justly said, that she had been left and abandoned by Christ, her Spouse. (Estius) — Jesus Christ will make good his promise:
1. by always dwelling in the hearts of the faithful;
2. by his sacramental presence in the holy Eucharist;
3. by his providential care, and constant protection to his holy Catholic Church. These last six lines of St. Matthew’s gospel, says the bright luminary of France, Bossuet, most clearly demonstrate the infallibility and indefectibility of the one, holy, Catholic Church, which all are commanded to hear and obey.
