jon - your problem could just be down to needing remapping. Hard to say really, could do with knowing what the fuelling is like when it happens. I had similar issues with mine when it was too lean at idle.
this is a picture of a throttle body:
those screws on the throttle plate hold the wedges on, when you remove the wedges these holes need sealing up or it wont idle properly.