you shouldn't need a bigger maf yet. the stock maf will support like 440 hp. ( i read that in the ford racing catalog)
sounds like you're having a problem with the iac valve. i'd try taking that washer out, my car hated that "trick"
if that doesn't help, try a new iac