You are correct...I notice the flaw all the time. Not being a musician I couldn't explain the flattened seventh but being a Scot and Corries fan I always sing it that way unless I get drowned out by those joining in!
Reading through the thread I can well remember the magnificent sound of 65000 voices at Murrayfield, mine was one of them.
H.