Sounds like a solid diagnosis to me, as long as they made sure the problem was not in the wiring. I think your wiring diagram must be different than mine, I have never seen a positive side switched o2 heater circuit.

The o2 B1S2 should be wired up like this ... Login to read more.