No, that does not cover everything because no one is ever going to get to the visible, eternal kingdom (which is NOT in heaven, incidentally) unless they are victorious over sin, death, the devil and the world. Only the uniformed, ignorant or simple-minded think of salvation in the one sense you mentioned: Freedom FROM the penalty (condemnation) of sin when in fact, Salvation is much more than just that. God's great and awesome salvation is a 3-in-1 salvation: God saves his people from the Penalty, Power and Presence of sin. Why do you think His salvation is often spoken of in scripture in three tenses, i.e. Past, Present and Future?