Baptism of Desire: Avoiding the Red Herrings on a Nearby Thread

[UnamSanctam]

I don't understand; Catholics believe the following right?

- Outside the Church there is no salvation
- Non Catholics can be saved with sincere faith or invincible ignorance
- Baptized and believers are considered Catholics
- Unbaptized can be saved with desire for baptism
- Unbaptized are outside the Church
- Heretics are outside the Church
- Heretics can be saved
- Heretics are part of the Church, though not visibly.

Hence, the unbaptized, invincibly ignorant, and non material heretics can be saved and are a part of the Church, even though they are outside the Church and even though 'outside the Church there is no salvation'

It doesn't seem to add up.