Has your dealer been giving you a hard time about the fact that you have an aftermarket intake on the car?
AFAIK, that pretty much voids the warranty on the MAF sensors. But it sounds like they're surprisingly willing to work with you even despite that fact - very different from my own personal experience with my local dealership.