Have you identified the pump from the fault codes as the air valves fail as well. On my 2.5XT I pulled the pump/valve relays and fuses then extracted the ECU file, unticked the secondary air system checks and flashed it back to the ECU. No fault codes after that.