06 Si - Engine Light from AEM Intake

I have searched for a post on this topic with no luck...and I think I know the answer I just want some feedback from someone with more experience. A family member of mine owns a 06 Si, mostly stock except for an AEM intake. Occasionally the engine light will come on and the engine will cut out. I am fairly certain this is simply due to the intake providing more air than usual and the ECU not knowing what to do with it. I also assume a remapping(correct term?) of the ECU will allow the computer to take the intake into account therefore solving the problem for good. Of course, on the record a Honda dealer will not touch this due to warranty issues. Is there a simple DIY fix or a reliable mechanic near Richmond, VA that can take care of this? Thanks in advance and my apologies for any noob forum fouls.:confused: :loser: