Cycle thru the tank of gas you have now and see if it clears up. Will it free rev past 4500rpm with out acting up? You said it has a aftermarket MAF try and unplug the MAF and see if it gets any better. I'm not far for you and off on monday if you cant get things sorted out.