You can ask different biblical scholars this question and get different answers. At the end of the day we really don’t know but it is fun to argue about.
And in fact it does not matter who is right. Believe in Him, behave accordingly, and then when He comes, end up in His presence. At that point, I could care less if that means in Heaven or on a redeemed Earth (which with Him here will be Heaven-like).