Jesus never said, "someday when you leave this earth you have heaven waiting for you". Contrary, He painted quite another picture:
He (Jesus) presented another parable to them, saying, “The kingdom of heaven is like a mustard seed, which a man took and sowed in his field; and this is smaller than all other seeds, but when it is full grown, it is larger than the garden plants and becomes a tree, so that THE BIRDS OF THE AIR come and NEST IN ITS BRANCHES.”
He spoke another parable to them, “The kingdom of heaven is like leaven, which a woman took and hid in three pecks of flour until it was all leavened.” Matthew 13-31-35
Heaven is pictured as a growing or expanding thing for each individual. Further, He directly addressed the issue of heaven when religious leader tried the challenge Him.
Now having been questioned by the Pharisees as to when the kingdom of God was coming, He answered them and said, “The kingdom of God is not coming with signs to be observed; nor will they say, ‘Look, here it is!’ or, ‘There it is!’ For behold, the kingdom of God is in your midst.” Luke 17:20-21
I am currently reading a book by A.W. Tozer title "Knowledge of the Holy". He makes the following statement that I can't get off of my mind. "the true God is everywhere and He is nowhere".
Omnipresent is a word that has been used to illustrate the everywhere present concept. Unfortunately the message delivered with the modern day message of omnipresence is that God is in our "everywhere". This world is not His. This world has yet to be redeemed and, therefore, is unholy. Furthermore, this world and this universe is His creation and like a carpenter creating a bench to sit on that carpenter is never a part of that bench (his creation). He remains above and separate form his creation. Likewise, our God is above and separate from His creation.
It is critical for us to link these thought together at this point. Jesus said, heaven is in your midst. God is everywhere present in heaven and heaven is everywhere that the created universe is not! Like the carpenter, He has effect and influence on His creation but is not influenced or bound by it!
If you are redeemed, it is now your choice where you choose to dwell. You may continue to dwell within His creation and be pressed upon on every side or you may choose to live, by faith, within His kingdom. The blood of Jesus qualifies us for citizenship. As a matter of fact, scripture tell us that we have been (past tense) with Jesus in the heavenly places. It is now simply left for us to choose where we will live!