It does sound a bit classier than when I was last in. Makes me miss The Vale even more.
The Newtown Bar in Bo'ness is a fair shout, though there are a few more contenders there, especially the Crown Inn, the Turf Tavern and the Learig (if they're still open). The only decent boozer in Bo'ness is the Richmond Hotel, IMO.
As far as Edinburgh is concerned, The Marksman is a bit of a dive, as is the Duke's Head a few doors down. Central Bar has a bit of a reputation, but I didn't have any trouble last time I was in there. One pub I will probably never venture into in Edinburgh is The Ferry Boat, as it looks pretty dodgy from the outside, and is apparently even worse on the inside.
The less said of Port Glasgow's pubs, the better.