OK - was asked to bring the car back today, and the service manager dealt with me, put the car up on the ramps, found the correct part, fixed the problem and gave it back to me, apologising about the way that I was treated and said that there is an internal investigation into the treatment I recieved.
Fixed at last - sorry, I still don't know the part number, but as long as its fixed.