Just a word of advice from a fellow strict EENSer that has been at this for almost 25 years:
Do not waste your time debating about the baptism of desire of the catechumen of St. Thomas Aquinas and later St. Alphonsus Ligouri, or the word "desire" used in Trent, for the people whom you are debating with totally reject the sources they are using to defend their belief! They do not even believe that a desire to be baptized is necessary for salvation. You are assuming that they believe in the baptism of desire of St. Alphonsus Ligouri, but they do not, for they believe that people can be saved who have no belief in the Incarnation and the Holy Trinity. No saint EVER taught what they believe. Do not assume anything, first determine with them if they believe in salvation by implicit faith, which is salvation by belief in a God that rewards, a salvation that does not require a desire for baptism, nor a desire to be a Catholic, nor belief in the Incarnation or the Holy Trinity. Debating about the baptism of desire of St. Thomas Aquinas wit those people is like arranging chairs on the Titanic.
In my 25 years of dending the dogmas on EENS and the sacrament of baptism, I have only met one promoter of baptism of desire that truly restricted it to the teaching of St. Thomas Aquinas. Do not waste your time debating about the innocuous theory of baptism of desire of St. Thomas, it is a theory which if true affects numerically speaking almost no one.