Yes, the crown is a stephanos. Which one? To be cast before the throne?
But what I am looking for here is a suitable phrase to replace the current one, which is about exchanging a stauros for a stephanos. I'll cling to the Christ of the Cross, and exchange Him for nothing else!
The hymn is a classic and was traditionally sung at funerals. IMHO, it does not need to be rewritten. :-)