I answered that question earlier. See the reply above that begins with "Pax, Baptism as we know has replaced Circuмcision".
I don't think you answered mine from Trent. But I appreciate what you are saying, you believe it requires further clarification.
I also give you the acceptable limits of theological speculation. Why don't you agree with SBC below, which has qualified what Fr. Feeney said somewhat, "Anticipating the rejoinder that no one is lost who dies in the state of grace, let me just affirm that I agree. Not only that I agree, but that I submit to this truth as I would a dogma of Faith. The Church, however, allows the faithful the freedom to believe that the providence of God will see to it that every person dying in the state of grace will also be baptized. "
I don't consider SBC's position to be heretical at all. I agree with them that the underlined is a dogma, and so the contrary is heresy.