Only Vatican II "catholics" believe that everybody goes to heaven, even repeating and impenitent sinners.
The bulk of true Catholics would affirm that they (VIIs) have it all wrong and have split themselves off from truth.
Some Catholics who see themselves as orthodox do not believe in Baptism of Desire. There is another group that argues that both Baptism of Desire AND EENS can both be true. If you want the arguments check around the site as they are constantly popping up and can go on forever.
You should at least see that both propositions that you are wondering about are not exactly about the same thing and need to be approached with a good deal of caution.