The firewall junction box is a water magnet, might want to check inside.
The troubleshooting is quick to blame the ECU, but I've never had to replace one. In my experience it's always something else.
Just an idea, you could run an overlay to the scv and see if that fixes it.