I was playing my bagpipes at my Mother's house on the 4th of July. I started playing Mairi's Wedding and my mother who is from Norwich, England started to sing the words to the tune. She told me a story of how her mother, (Caroline Moore) from Glasgow, Scotland used to sing that tune when my mother was growing up. The words my Mother sang are the same as you have listed. This would have been in the 1930's!