Edinburgh was pretty much my favorite city in a trip I took to the UK several years ago and Sir Funk pretty much sums it up.
If you have some time Holyrood Park, behind Holyrood Palace, was a nice place to walk through and the hike up Arthur's Seat was very fun.