sounds like it could be the CPS with the way you describe the RPM changes. RPM fluctuation is a pretty good indication.

try the resistor tab bend thing and see if that helps. if not, maybe it is your CPS or fuel pump. any SES lights??