I see two messages in the NT:
1. Salvation from death.
2. How to be a good son/heir, now what you are saved.
All who believe are heirs. Some of us are better sons and others worse sons. But those of us who believe are saved, regardless of our actions. Of course, we are also told to judge a tree by its fruit - but we are all flawed.
My favorite bumper sticker: “Jesus is coming soon. Look busy!”
How can you know you are saved until you die and are judged by Christ in the Particular Judgment?