In the back of my mind, I seem to recall a statement made by the Roman Church a few years back regarding their teaching of 'limbo' (a teaching which caused much torment to many faithful Roman Catholics who lost a child at birth). .
The now abolished teaching of Limbo was better and kinder than the current teaching.
In Limbo souls were said to be in a state of happiness and unaware that there were other states and other degrees of happiness.
The current teaching (see the CCC) states the people may now *hope* that unbaptized babies are in heaven but there is also the likelihood that they are in hell.
I don't think you are actually drawing from any formal teaching of the Church in your assessments above. I have heard you say such things in the past but there's no real evidence for it from any formal sources.
VI. THE NECESSITY OF BAPTISM
1257 The Lord himself affirms that Baptism is necessary for salvation.60 He also commands his disciples to proclaim the Gospel to all nations and to baptize them.61 Baptism is necessary for salvation for those to whom the Gospel has been proclaimed and who have had the possibility of asking for this sacrament.62 The Church does not know of any means other than Baptism that assures entry into eternal beatitude; this is why she takes care not to neglect the mission she has received from the Lord to see that all who can be baptized are "reborn of water and the Spirit." God has bound salvation to the sacrament of Baptism, but he himself is not bound by his sacraments.
1258 The Church has always held the firm conviction that those who suffer death for the sake of the faith without having received Baptism are baptized by their death for and with Christ. This Baptism of blood, like the desire for Baptism, brings about the fruits of Baptism without being a sacrament.
1259 For catechumens who die before their Baptism, their explicit desire to receive it, together with repentance for their sins, and charity, assures them the salvation that they were not able to receive through the sacrament.
1260 "Since Christ died for all, and since all men are in fact called to one and the same destiny, which is divine, we must hold that the Holy Spirit offers to all the possibility of being made partakers, in a way known to God, of the Paschal mystery."63 Every man who is ignorant of the Gospel of Christ and of his Church, but seeks the truth and does the will of God in accordance with his understanding of it, can be saved. It may be supposed that such persons would have desired Baptism explicitly if they had known its necessity.1261 As regards children who have died without Baptism, the Church can only entrust them to the mercy of God, as she does in her funeral rites for them. Indeed, the great mercy of God who desires that all men should be saved, and Jesus' tenderness toward children which caused him to say: "Let the children come to me, do not hinder them,"64 allow us to hope that there is a way of salvation for children who have died without Baptism. All the more urgent is the Church's call not to prevent little children coming to Christ through the gift of holy Baptism.