One thing you can try is unplugging the MAF. If you find that power is increased you definatly need a new MAF. My understanding is that the ecu will use a default setting should it not have a MAF value to work with.
Ideally, you want to pull the MAF (the harness) and have the car's performance drop drastically, almost as if it were in limp mode.
A real cheap thing to do try (but likley wont fix your problem) is to put some dielectric grease in the connector...alot of guys have tried this and enjoyed the results. Just thought it may be worth mentioning here. (you can search the thresd here...it's worth a read).
Good luck!