yeah. reset both at the same time would be good, just to make sure. Basically my thought is if you can get it running without any correction going on. everything at zero and then unplug the o2 so it stays there while running. if it runs better then it's correcting incorrectly. like pulling fuel based off leaks. then you'd atleast have a place to start. if it runs even worse, then that could mean a injector is stuck open or something making it rich. followed up by checking the plugs to confirm rich or lean running badly. it's crazy how both can kinda feel the same sometimes.
but as it is with the ecm removing a bunch of fuel, we don't know if that's helping or hurting.