I'd recommend Geoffrey Taylor and their London service is excellent. Celtic Crafts in Paisley Close Edinburgh is also good, and the problems I had were rectified easily.

Most of the other Edinburgh kilt shops are now owned by companies who import cheaper products and woven tartans from Asia (including some of the old establish kilting shops who still trade under their original name.