Might sound silly but I remember my old c2 had a prob boiling when in traffic and I got talking to a vw golf mechanic and when I explained he said to change the header tank cap as it was a common thing in the golfs and sure enough it cured the prob ,,might be worth a go