Where When is home?

There are so many otherwise great hymns that lose it in the final verse, suggesting a gnostic flight from the world into a 'home' elsewhere, beyond the skies. Revelation speaks of a 'new heavens and a new earth', and pictures the heavenly Jerusalem coming down from heaven to earth (not the other way) - I take this (amongst other verses - this probably needs a series of its own) to mean that Christians are hoping for the resurrection of the dead onto a restored/renovated earth, not a flight off onto another world or into a disembodied 'spiritual' existence with God.

Compounding the error, many hymns seem to place this hope at the point of death, such that death becomes a doorway into this 'heavenly bliss'. While death for the believer is indeed accompanied by the promise that we will be 'with' Christ, this seems to be very much a sub-theme of the New Testament. More important is what happens after the 'afterlife' - namely, real life once more in a perfected body upon a liberated earth. Perhaps once again, there is a series of posts waiting to be done here.

For many hymns, perhaps a simple correction is available: simply replacing a locative reference with a temporal one. Instead of our hope being located elsewhere, it might be less confusing to sing of its being located elsewhen. I'd love to start compiling a list of hymns that could be improved on this point. Any suggestions?
BTW ten points for picking this Sydney landmark. Twenty if you're not from Sydney.