I had the same surging problem with my ryobi at high revs, was driving me mad but after changing 2 diaghrams it seemed to fix the problem sometimes diaghrams seem ok but they are not supple enough and don't perform.

Adrian.