Salvation Stipulation...

I was recently asked, "at what point is a person saved?". It was one of those theoretical questions that you feel like you can only give a heretical answer to. The underlying question this person was asking was, "Does baptism really have anything to do with salvation?". We talked about it and came to no great conclusion. I told him I view salvation as a process, not a one time event. It is a matter of repenting, believing, confessing and baptism. All these things do not happen every time all at once. So, if someone dies before the process is complete, are they saved. I would probably say yes, but for those of us alive, does that mean we can neglect the process, I would say no.
What it got me thinking about, and the reason for this rant is the idea of the word "saved" we Christians like to throw about. The idea that we accept Christ and are, at once, presently translated into a new person - we are longer on the recieving end of God's punishment stick. Our talk about being saved is as though it is a present reality a current occurence. Our idea of the word is tha "I am saved" (meaning I am currently, presently saved from sin), the scripture, on the other hand, talks about salation in the idea of "those who are being saved" (2 Corinthians 2:15), as far as I can tell, and I certainly will leave room for me to be wrong, salvation is a future tense reality, not a present occurrence in our lives. Hebrews 9:28, speaking of Christ's sacrifice to take away sin says "and he will appear a second time, not to bear sin, but to bring salvation to those who are waiting for him." 1 Peter 1:9 says "for you are receiving the goal of your faith, the salvation of your souls." (The emphasis in both verses is mine). It seems that salvation is a life long process that we are all rending ourselves through until the day of Christ or our final breath on this earth. Does this mean that as believers we are no different? That no change has actually taken place in us? I would say not. We have become the dwelling place of God on earth. The Holy Spirit dwells within us, those who are believers, He is our deposit until the day of that salvation (read 2 Corinthians or follow this search link). This means that God is freeing us from sin and yet we are bound by it. This means that we still hurt, still die, still cannot understand, and we still see as though we are looking into a foggy mirror. There is a day when salvation will come on a white horse and he will have his name tattooed on his thigh. His sword will protrude from his mouth and once and for all we will be healed.
So, when is a person saved? When they die...