There's a lot to digest in Bruce's magisterial note to the song, but it looks as though the chapbook "Derby" version can be dated to the 1790s, but "Fyvie" not till 1828.

So "Derby" can be taken as the likely original, barring new discoveries, of course.

As for the "corrections," they look like Bruce's attempt to improve a faulty (or faultily remembered) song with better phrases from another version.

There's nothing wrong with that sort of editing so long as, like Bruce, you also indicate carefully what the original words were.

Otherwise the evidence is misrepresented and the "corrected" song will confuse people who want to see the original text, warts and all.