Have them clean the MAF as well. Those symptoms were very similar to some problems I had when I first got mine (including running better with a full tank).