I got just the right side kit from Dan first when my 96 GS started making that sound almost two years ago.
It actually improved my surging issue as well (though that could also have been replacing...