Sounds like the OP may have made conformance with more than 35 minutes to spare. I do think this is poor show, especially given the discussions with the agent in Abu Dhabi, but these things are not always communicated to agents at the other end. I'd expect BA to pay for the hotel in Edinburgh and compensate with some Avios. It may also qualify for EU compensation, although that may depend on how delayed the arrival into Edinburgh was.