Thanks everyone, great to have all your knowledge to call on.
It sounds like I'm running about 30C too high. Oil pressure looks good at 2bar usually.
I'll get the car back to the factory on Monday and have it checked out.
I'll let you know what they say.