Well I plan to delete the EGR and tune it out, so I'm less inclined to fix it right now. I'll take out the MAF and intake and make sure both are clean, see if that helps.

I also forgot to mention that I've also been getting really bad gas mileage, about 18 mpg on my last tank (which was mostly highway). Related?

 

Since you plan on corking off the EGR, do that sooner than later. And I'd do it before trying to hunt down some other "cause" that may actually be non-existent. Sure, you've had that code for while, but that's not to say the problem isn't getting worse.

 

I'm off work the first week in July, and I pretty much only drive the car on weekends, so I planned on doing the EGR stuff then. Should I go ahead and still look into the MAF and intake anyway?

 

Sure, those are things that cost you practically nothing. Periodic cleaning is a good thing to do anyway, use a MAF spray cleaner.