You could try the Renault dealer along Seafield Road (a bit east of Leith). I went there for my warranty work and they were excellent, nice people too.
It was at that time called Abercromby Renault, whereas now it has been bought by Arnold Clark and the name has changed. I dont know what it is like now or even if it has the same staff, but maybe someone else here knows.
Otherwise a trip over the Forth bridge might be worthwhile, as the Renault dealer in Dunfermline has a very good name and I gather they give a 15% discount to ClioSport members too.