Cloth diapers and detergent

We’re currently using Grovia ONE and Bumgenius, but the elastic is starting to stretch on both brands, and I can’t get them tight enough around my son’s thighs anymore. I’m planning to make the switch to Smart Bottoms, unless someone has another suggestion?

Also, I’ve been washing his diapers without detergent for several months and they’re starting to get permanent discoloring, so I’d love a suggestion for a cloth diaper safe detergent. We use Molly’s Suds and Biokleen for the rest of our laundry, but I saw a brand called Rockin Green Dirty diaper laundry detergent that I may try if it’s more effective for urine and fecal stains. Has anyone tried that brand or have a better suggestion?