We have hard water too and started having stink problems. Then on green mountain diapers website they have a whole handout for this!! We are using borax with detergent and it's working!! They had something on there for iron in water causing rust stains but I didn't read it. Hopefully that site helps!!!
Also calgon helps to soften water. Good luck. Oh we also use RnG hard water version.