Air France is refusing to pay compensation under EU rules (ie: refund of price paid for travel
That's if you choose not to travel - if it had happened on your outward journey you could have done this and been returned to Edinburgh.
I don't think that you are entitled to compensation and the CAA seem to agree with me
http://www.caa.co.uk/default.aspx?catid=306&pa getype=90&pageid=6547#eleven
But I'm by no means confident of this. The regulations were written with overbooking and cancellations in mind - their approach to 'mere' delays is obscure.