Thanks, I'll take that advice.
The garage were supposedly going to send someone round today to look at it. But unsurprisingly, no word.
I took it out on a run today, it only conked out about 6 times in no more than 5 miles. I was sat in Tesco car park for 1/2 and hour trying to get it to start...