Well said. I think he would be wise to use the discipline of an old German composer, and not take away from the original style and precision, that made it a masterpiece to begin with.
If you listen to his other songs that he plays live, they are always almost note for note. Even the more difficult phrases. But, Cry For You he will choose to improvise instead. Definitely not because he can't play note for note. There must be reason but only Andy will know.