So is your view now, those who went straight to heaven in the OT will be transferred to the new Jerusalem on this earth as prophesied in rev 21:1-3 I am assuming it is.
Your view contradicts a lot of plain scripture, you must also believe they entered heaven in an imperfect state as per your quote of hwb 11:40
I don't see how that is possible, but I'm sure you can explain it!!!
NO my view takes in a little more than that, but in a nutshell, They are resurrected when Jesus comes at the beginning of the 1000 years where they rise and meet the Lord in the Air and are taken to heaven for 1000 years. But after the 1000 years they return to earth with God and the Holy City in which the earth is made new and then they have received the promise.
As for the one or ones who already went to heaven WE are not told what they do. If they are in heaven well then they are already at the city which is there until after the 1000 years where it comes here.
Imperfect state? I have no Idea why you think that?