Well... I got my car back on Friday night and they have fixed the problem. One of the sensors before the cat (it measures oxygen apparently) was faulty so they have replaced that and so far so good!
Unfortunate that they couldn't find the fault the first time!! But it's fixed now so...
