Most of those brand name products you mentioned early on are phosphoric acid primarily. You can buy it fairly inexpensively without having to pay for the commercial/retail packaging and brand name. The citric acid you used looks to have worked just as well however. Does it leave a conversion layer (like the iron phosphate left by phosphoric acid) that resists new rusting?