I come from Paisley where Kenneth McKellar was brought up. I have always known Afton Water to be sung in the same version that he recorded ( hear it on Ebay) Its a beautiful melody.
This other tune from Alexander Hume or Spilman cannot compare.