God's primary message to mankind is 'Come to Jesus.'
"I Jesus have sent mine angel to testify unto you these things in the churches. I am the root and the offspring of David, and the bright and morning star. And the Spirit and the bride say, Come. And let him that heareth say, Come. And let him that is athirst come. And whosoever will, let him take the water of life freely. For I testify unto every man that heareth the words of the prophecy of this book, If any man shall add unto these things, God shall add unto him the plagues that are written in this book" Rev 22:16-18
The Gospel of Grace shows that every requirement has been fulfilled... grace removes every obstacle, excuse or objection that would hinder coming to Jesus.
The Spirit says 'Come'... the remnant in the Church says 'Come' and it says to anyone who reads the book to say 'Come to Jesus'. One day the Church will be gone and all Hell will be breaking loose in the World. Believers will read this book like a newspaper to find out what is happening and what will happen next and the message will still be 'Come if you are thirsty and drink for free'.
Don't change the message. God will have a problem with you.
It is not 'Come if...' or 'Come when...' or 'Come after you...' it is just 'Come to Jesus'
When I hear the undiluted message it just makes me want to come to God. It makes me want to tell others to come to Jesus.