You can interchange the motors themselves (S1 and S2) without a problem. The differences lay within the wiring, throttle body, AFM, coils, and some later model O2 sensors (still wiring).
The ECU's do have their differences however, I've seen S2 motors run perfectly fine with S1 ECU's.
Hope that helps.