According to mainstream Christianity, what happens after one dies? Old Belief [held for decades]

After a person dies, the person sleeps until Judgment day, and is then awakened and goes into either heaven or hell.

New Belief (realized only yesterday)

Immediately after a person dies,


the soul separates from the body
the soul goes to either heaven or hell (A)
at final judgment, soul + body are united, then the person either goes into heaven or hell (same place as in [A])


This new belief is backed by:


http://www.reformed.org/documents/wcf_with_proofs/
http://www.gty.org/resources/Sermons/52-17
http://www.gty.org/resources/sermons/90-311/what-happens-when-a-christian-dies


In particular, the Lazarus / Abraham story was literal, and not fiction -- after one dies, one can "see" everyone else who has died (and whether they belong in heaven and hell.)

Question:

I think my Old Belief is wrong, and the New Belief is correct. Is New Belief inline with mainstream Christianity? [I suspect Yes, but want to double check.]
The Athanasian Creed, which is accepted by most christian, (esp. catholic, orthodox, anglican, Lutheran, etc.) reads thus:


  ...He ascended into heaven, he sitteth on the right hand of the God the Father Almighty, from whence he will come to judge the quick and the dead. At whose coming all men will rise again with their bodies; And shall give account for their own works. And they that have done good shall go into life everlasting; and they that have done evil, into everlasting fire. This is the catholic faith; which except a man believe truly and firmly, he cannot be saved.


But then, also, in Luke, Jesus says quite clearly:


  Jesus answered him, "I tell you the truth, today you will be with me in paradise."
  
  Luke 23:14


Jesus doesn't imply any form of waiting here. (though there is an interesting discrepancy here because Jesus descends into the place of the dead, and rises again on the third day).

Anyways, most christians hold that:


Sin causes separation: Man from God, will from actuation (we must work, and strive to survive cf. Gen 3:17-19), and Body from Soul
Jesus's sacrifice 'tears the Vail' between us and God (bridges the separation) (cf Matthew 27:51) and allows us to enter into the kingdom of heaven.
Because of bullet 2, at the end of our earthly lives (or, in catholic doctrine, after the refining of our souls in purgatory, the souls of the faithful go to heaven where they await the coming of the end of time, where they will 'give an account for their own works', and see God create 'a new Heaven, and new Earth..."


  "Then I saw a new heaven and a new earth, for the first heaven and the first earth had passed away, and there was no longer any sea." (Rev 21:1)