[...trimmed text...]

Right on, sounds good. The only other thing I would check related to connector swap is to watch scan data of the O2 sensors and unplug B1S1 to make sure the PCM recognizes the correct sensor, and may... Login to read more.