when was the last time you changed your fuel filter? If a maf goes bad, it wont rev past 2k. I'd rule out the maf and look for fuel related issues.