Salvation

What is God's intent for man's salvation? My experience is that most Christians think of salvation as a matter of heaven or hell. Salvation to them is only in relation to the eternal destiny of man's soul. My current study of the story of man's creation it seems to me that salvation is much more. In the beginning it appears God created man and intended for them to have a relationship. This relationship was broken by the disobedience of man. The intent of the Creator was then to restore the original relationship. This was done by making Christ sin for us. Christ bore our sin in his body and through acceptance of Him we can have a restored relationship with the Creator. If my thinking is correct salvation is for today not simply the future. It seems to me that salvation is for those who desire to have a relationship now with their Creator and not simply to get a "fire insurance" policy for the future.