Well running rich isn't good but better then running lean. Do you have any intention in getting a tune? I take it from your post that the CAI didn't come with one, that it had a calibrated MAF. Is the CAI installed properly?

If your running rich I don't think cleaning the MAF is the solution. If the sensor was dirty it would read less air flow and you should run lean. I could be wrong (nothing new there) but I think it might be time for a call to Granatelli.