Just thought I'd follow up with a big thumbs up:party:! Two days, 6.5 gallons of 8.25 bleach, and a little less sleep later I've passed the OCLT, CC 0, and the water is sparkling! Thanks so much for the help!
My next fun adventure - figure out why my bottom-hinged weird doors aren't floating...