I realise you posted this question many years ago, but I have several John Waughs in my family tree, with two living in Glasgow during the time period you question. My grandfather John Waugh was born in Maxwelltown (at that point part of Troqueer Parish in Kirkudbrightshire but these days part of Dumfries). He moved to Glasgow some time around the turn of the 20th century and married his first wife, Sarah Loudon in 1904 and they had two children, John (born circa 1908 and Charles born 1916). John and Sarah later divorced and John remarried to Catherine Carmichael. They want on to have three more children, one of whom is my own father. I have very little information on these two John Waughs in Glasgow, but can tell you that the elder one died in 1942. I hope that, after all these years, this information still has some value to you.