St. Peter Canisius, Doctor of the Church who who present and spoke twice at Trent. In his catechism, when he states that Baptism is necessary for adults and infants, by adults he has a footnotes that references Trent and two passage from the Church Fathers, both of which explicitly state that even good Catechumens cannot be saved if they died before receiving the Sacrament of Baptism.
Apart from that, defend YOUR "reading of the text". Neither theologians nor Doctors nor Church Fathers (except the latter in unanimity) are infallible.
But, you can't and you won't, because you don't want to consider the matter honestly. You've already made up your mind about what you want to believe on this subject.
Canisius is speaking "generally" in that passage from his Catechism. He is not considering all of the theological corner-cases that are too much in the weeds for his target audience. He was writing a catechism for adolescents, as you can see in the title of his work "
Summa doctrinæ christianæ . . . in usum Christianæ pueritiæ." A catechism directed at adolescents is not the place to go into detail on BoD.
You might want to cross that one off your list.
Now, the Catechism of Trent, IS directed at a higher-level, more mature audience, specifically Pastors and Priests. It does discuss BoD:
"...should any unforeseen accident make it impossible for adults to be washed in the salutary waters, their intention and determination to receive Baptism and their repentence for past sins, will avail them to grace and righteousness."
Unlike the Canisius catechism, the Roman Catechism was officially promulgated by the Universal Church and guaranteed to be free to essential error.