For whisky, I like the Pot Still or the Ben Nevis.
Café Gandolfi for haggis, neeps and tatties or an alternative is Strathaivgin.
What to see and do in Glasgow:
Kelvingrove Art Gallery and Museum
If you can get out and about from Glasgow:
Walking the West Highland Way
Ferry over to Rothesay
Quarriers Village - and eat at The Three Sisters Bakehouse about 5 years ago
Pot Still on Hope street is correct but any decent pub in Glasgow will have decent whisky, as any decent non-specialist restaurant will have decent haggis.
For both, and decent beer, decent service, and a proper scottish pub try the Babbity Bowster. The Cafe Gandolfi is a Glasgow institution you'll get some classy haggis in there, plus the whisky, and a lot more besides.
Go to The Corinthian and The Counting House for city centre pubs with great interiors, The Art School and the Hunterston Museum for Rennie Macintosh. Walk the Merchant City, Princes Square, Ashton Lane, have a pint in Jinty McGintys, do a play and a pint at lunchtime in Oran Mor. The Horseshoe bar if you want a proper old school Glasgow pub. about 5 years ago