Clean the MAF and TB, like you suggested, don't replace the MAF just yet. They are made to last, they don't really wear out. Use some alcohol and CAREFULLY clean the sensing element inside the center post of the MAF. Also check/clean the electrical connections around the engine compartment. Look for cracked/broken/missing harnesses and repair/clean/replace as needed.
Did you replace both O2 sensors or just the upstream? May want to replace the downstream sensor also. A tranny flush would be a very good idea, along with the brake fluid. Check the coolant also, I would imagine its been changed by now but check it to be sure.
oh, and.......
FOR THE LOVE OF GOD...CHANGE THE TIMING BELT!!! 
Welcome to the boards by the way.
