Your interpretation is really a 'fleshy' thinking about the resurrection. We don't get new flesh bodies, so the resurrection really is not about a literal dead in the ground waiting to be raised idea. That idea is from the old Jewish traditions of men.
Ecclesiastes 12 was the first Scriptures that reveals what happens at death, and what our makeup is that God created us with.
Eccl 12:5-7
5 Also when they shall be afraid of that which is high, and fears shall be in the way, and the almond tree shall flourish, and the grasshopper shall be a burden, and desire shall fail: because man goeth to his long home, and the mourners go about the streets:
6 Or ever the silver cord be loosed, or the golden bowl be broken, or the pitcher be broken at the fountain, or the wheel broken at the cistern.
7 Then shall the dust return to the earth as it was: and the spirit shall return unto God Who gave it.
KJV
That is the first ever Bible mention of the idea of a "silver cord" being a link between that "spirit" and the flesh. Old traditions treat that "spirit" part like just something that animates all things with life, like animals and plants also have it. But in Matthew 10:28 Jesus said to not fear one who can kill the body (flesh), but not the soul. That reveals that our soul is connected to that spirit that goes back to God at flesh death.
In 1 Corinthians 15, this is actually what Apostle Paul was teaching, revealing that both our flesh must be changed to a body of incorruption, and our "this mortal" (soul) must put on immortality. The "spiritual body" is our "image of the heavenly" Paul spoke of. It is that "spirit" part of Eccl.12 that goes back to God at flesh death. It dwells inside our flesh body even now, it's our spirit inside our flesh. It is our person, our individual personality. In 2 Corinthians 5, Apostle Paul taught that if our flesh house were dissolved, we have another house not made with hands (i.e., not of flesh), eternal in the heavens. That's about our spiritual body that dwells inside our flesh body. When our flesh body dies, our spiritual body merely steps out of it.
One of the ancient pagan beliefs about the soul/spirit was that at flesh death it's like a drop of water that goes back into the Great Sea (their concept for God). And by that it loses its individuality. It is absorbed into the "great All" some of them would say. That is not how it is, thankfully. Our spirit with soul retains its individuality after death of our flesh body. Otherwise each person's works could not be judged because the person would simply no longer exist. Eastern mysticism practice actually depends a lot on the concept of the individual becoming absorbed into the Great All of Cosmic Consciousness. That is why their practice of meditation is about removing all thoughts and trying to become 'one' with the Great All. That is a primitive belief system and it goes back to the days of ancient pagan tribalism.