I can highly recommend Ian's room/house.
Ian was very flexible with both check-in and check-out, and he can give you a lot of good advise/tips on what to see in Edinburgh.