I am having the same trouble tracing my gg-grandfather William Waugh (b 1837, Ireland). He married Catherine Currie 1863, Campbeltown. William's Parents were, William Waugh (b 1810, Ireland, son of William & Helen McWhinne?) & Mary Thomson (b 1810, Ireland, daughter of John & Mary Ferguson).
I too used Griffiths Valuation and found the Waughs and Thomson in Shankhill. I've ben trying to trace if they are my Waugh's. Have you managed to confirm if thay are yours?