Nothing like a set of fresh eye's and hot coffee to get the day going.

Nothing wrong with tuning the MAF or going SD full time. In SD, you have one less variable to deal with, the MAF, but I would strongly suggest COS5 as it has provisions for dealing with daily delta T's.