You might have laughed on my tour,
if you want MORE laughs,
I run two weekly comedy nights in Edinburgh:

Every Tuesday at the Beehive Inn, Grassmarket
Every Thursday at Dragonfly, West Port

As promised here are some recommendations for you:

BREAKFAST
SCOTT'S KITCHEN, VICTORIA TERRACE
CITY CAFE, BLAIR STREET

LUNCH
PIPERS REST, HUNTER SQUARE
CONTINI, CASTLE HILL

DINNER
MAXIES, VICTORIA TERRACE
WEDGWOOD, CANONGATE

COFFEE
BLACK MEDICINE, NICOLSON STREET
ST. GILES CAFE, ST. GILES STREET
MILKMAN, COCKBURN STREET

QUIET BARS
BOW BAR, WEST BOW
WAVERLEY BAR, ST. MARY'S STREET

LOUD BARS
STRAMASH, COWGATE
BANSHEE LABYRINTH, NIDDRY STREET

FREE ACTIVITIES
NATIONAL MUSEUM, CHAMBERS STREET
MUSEUM OF EDINBURGH, CANONGATE
ST. GILES CATHEDRAL, ROYAL MILE
WRITERS MUSEUM, LAWNMARKET

OTHER ACTIVITIES
DEPT. OF MAGIC, BLAIR STREET (HARRY POTTER BAR AND ESCAPE ROOM)
HOT TODDY, JEFFREY STREET (WHISKY TOURS)
INCHCOLM ISLAND TRIP, SOUTH QUEENSFERRY
MEDICAL MUSEUM, NICOLSON STREET