Long-term, I'd move to something more robust than One Step for sanitizing. One Step/PBW/CMC/OxiClean/etc. are great cleaners, but not necessarily great sanitizers. I've had a Lacto contamination that was almost totally resistant to CMC, for example.
Pretty much everyone in brewing uses either an iodophor or an acid blend (like Star San) for sanitizing. Ideally, I'd get both and alternate.