Glad you got it sorted, and Thanks for posting the solution
Honestly, I'd put in the O2 because you have it. They don't usually just fail, they get lazy slowly.

Enjoy the ride! "You have a headlight out!" haha