Well, I replaced the K&N filter back with a stock one and hit the MAF with some electronic parts cleaner. The MAF did not look oily. The noise is almost gone, the acceleration seems to require a little more "gas" now and maybe it was running leaner causing some "knock". I still think there is a problem somewhere. I'll keep you guys posted.
