Well, after much fiddling around, I just replaced the MAF and it fixed it

Thanks for all the help, BTW I just replaced the insert, not the whole tube assembly, got the insert (Bosch new unit) for about $100, works fine, passes smog now, thanks!
Cameron
San Diego