Forget labels, colors, segregating tanks, etc. When you set up your tank at the site you analyze the mix you are about to breath, then mark (or re-mark) your tanks.
If you don't own an analyzer then buy one, they are cheap compared to all the other gear you all own or death or DCS or ox-tox
..
I fully concur with jadairiii. I was taught during my EANx certification to confirm the O2 content of the tanks with a pocket analyzer to either confirm or adjust the marking on the tank from filler. I plan to get one myself (i.e. Nuvair O2 Quickstick, Maxtex MaxO2, Analox O2EII, anything as long as it is not made in China), and make it a determined, "do not dive unless..." habit of checking tank O2 content, prior to applying BCD.
I know this sounds like I, less than 25 dives, am teaching someone like DD to 'suck eggs', yet I have seen so many suffer from arrogance and assumption and then be destroyed by such...
What Shultz (in the video) said that went off the rails in my view in her talk is when she said "we just do not know when we are wrong, there is no sensation of 'wrongness'".
I disagree. In my whole entire first hand experience of life in this physical body here on this planet, I have always had a 'sensation' of when things were about to go 'tits up'.
Call it intuition (gotta listen to the inner voice for it to work for you), call it "higher self", whatever - there is always a warning from that within (spirit, soul, god, non-physical, call it what you will), just before an intended course of our own action shall lead us to harm.
I am grateful the OP shared his experience. It takes courage to admit a series of conditioned assumptions, followed out of experience-generated arrogance nearly led one toward a perilous condition. A second chance has been handed to you.