I disagree. The album version was great, but he waaaaay overplayed it on the JT tour. It seems to me that he knows best, and if he's changed it so much it would indicate that he wasn't satisfied with the version from the R&H era.
I think that the way that it was played on Elevation is just so graceful and powerful - which is far more in line with the album version. He has totally matured as a musician since 87-88, and his playing reflects it.