Don't ever leave an O2 in fresh air just hanging and plugged in - IF IT IS still plugged in. Causes all sorts of problems. Unplug it and set codes to no error so it's ignored. Unplug the other bank too. Gotta keep it even if at all possible due to how they run test. Post O2 test run to 5000 rpms if not disabled on these. This will cause all sorts of self test and fuel sticking issues.
I'm a root cause person too. Reason I said to address fueling first. Airflow and torque control all of those things but as you stated to a degree - they all go hand and hand.