$2k for a mafless tune? You'd want jobbies included in that price. :) A custom mafless shouldn't be much more than $1k.
Unless you REALLY need to stay MAF, as above, get a mafless tune. When you say you've got an exhaust, is it a full exhaust or just a catback? If just a catback, get hold of...