I spent 3 nights with my girlfriend at Pier's place in Edina Place. The flat looks recently renewed and is really comfortable, technologic and clean.
Pier is a very professional host, very unobtrusive yet really helpful. For your stay in the Edimburgh he's more than recommended.