If there is no limbo your choice is heaven or hell, and YOUR church teaches one can not go to heaven unless they are baptized..
154. Q. Is Baptism necessary to salvation?
A. Baptism is necessary to salvation, because without it we cannot enter into the kingdom of heaven.
Go back to your Catholic Encyclopedia quote.
The Question is from the Baltimore Catechism which was developed to teach elementary level Catechism to school children and marginally literate adults. Its answers are very simplistic and incomplete. It was developed in 1885 and was last updated in 1933. It was "retired" in the 1960s following Vatican II.
It is assumed that adults interested in learning the whole and complete Catechism will seek out other, more complete sources including the whole and complete Catechism of the Catholic Church.