Car is currently in the garage (SWR in Stirling) and they have fixed it. Happy days.
Turned out to be the UPC. I've got a receipt from the previous owner showing this was replaced to fix the fault last year, so I'd not considered it. Lesson learnt, always check yourself, don't take someone else's word for it.
Thanks for the help/suggestions on here, this was ruining the car for me.
With any luck I'll be at Knockhill for the track day next Saturday.