Plug your maf back in and please do your wallet a favor, stop trying to diagnose stuff that you didn't touch. This is something you touched/broke. You know you have a vacuum leak, it acts like a vacuum leak, it smells like a vacuum leak.... I'm gonna say...most likely ..it's a vacuum leak. Unplugging the maf put you on the table which runs rich etc. That's way it seemed a little better for a bit.
Chris..next time you want to free rev past 4K punch yourself in the nuts. The only good that'll come from that is learning how to swap a motor. I'm thinking you don't want to do that.