Building in heaven or raised imperishable?

It seems that believers will receive their new bodies at the second coming: > 1 Cor 15:51,52: "Listen, I tell you a mystery: We will not all sleep, but we will all be changed — in a flash, in the twinkling of an eye, at the last trumpet. For the trumpet will sound, the dead will be raised imperishable, and we will be changed." However, if a believer dies before the second coming, it appears that they will already receive a new body: > 2 Cor 5:1: "For we know that if the earthly tent we live in is destroyed, we have a building from God, an eternal house in heaven, not built by human hands." How can these two scriptures be reconciled? Is the "building from God" a temporary vessel until the believer receives his/her resurrected body at the second coming or are these two bodies the same? Or maybe something entirely different?