Pardon me for saying this if it sounds blunt but let's try to put it this way.

Does it matter if your body dies before you go to Heaven or "have to die"? No it does not. No matter if your physical self dies or not, you still have the free gift of Salvation in Jesus Christ where you will be born agian spiritually and given eternal life with GOD in Heaven. You have to die to self and be born again of the Spirit of Jesus Christ.

1 Peter 1:23
For you have been born again, not of perishable seed, but of imperishable, through the living and enduring word of God.

John 3:3
In reply Jesus declared, "I tell you the truth, no one can see the kingdom of God unless he is born again. "

Romans 8:11
And if the Spirit of him who raised Jesus from the dead is living in you, he who raised Christ from the dead will also give life to your mortal bodies through his Spirit, who lives in you.

Romans 8:10
But if Christ is in you, your body is dead because of sin, yet your spirit is alive because of righteousness.