I am from Glasgow as well, but I pronounce them differently. Pretty much how you describe them in your fist sentence.