While you're on with it, its worth removing the throttle pedal and checking for water ingress in the connectors. We've had three come in with running issues in the past which turned out to be furry connections on the pedal due to this water leak.
Mushroom city when theyre left for a bit too
Heater matrix common on these....