Somehow we are going to have to switch our thinking from dying and going to Heaven, to the Day of Resurrection. The New Testament consistently points to judgment and rewards in the Day of Resurrection, not at the hour when we die physically.
We must turn our attention to preparing for the resurrection of our body.