Just an update. The O2 swap didn't fix the issue so the O2's appeared to be a symptom rather than a cause. I did some more troubleshooting and found there was a short somewhere in the harness. There was continuity between the positive and negative battery terminals. I tried pulling some fuses to isolate the circuit but got no where.
At this point I punted and ordered a new stand alone harness from Wayne Hartwig at 150tunes. That was back in November, lead times being what they are these days, it arrived last week and I got it installed this week.
I have to say, buying a harness is so much easier. While installing it, I kept thinking, where is xyz circuit, then I realized it is all included in the harness. Were I to do this again, I feel like it's money well spent. I got the old harness out and the new one wired in about a day. The only issue I have is it's no where as clean as my custom harness, obviously. You get a one size fits all harness length, but I was able to route everything without too much coiling and snaking. Overall, it's a good compromise.
I put 30 miles on it yesterday with zero issues. It also starts without the double crank I was having to do prior. Not sure what fixed that but I assume there was some sequencing with the ignition that I had wrong by tapping the wrong place in the power up sequence.
Good to be driving this again, hopefully it lasts longer than a month before another issue pops up.