How can I fix my crunchy diapers?

I have switched to Country Save and no longer use washing soda (tho I do sprinkle the diapers in the pail with baking soda). I got a diaper sprayer so there is barely any gunk on the diapers when they are washed. I wash in my FL every 2 or 3 days. First I do a cold rinse. Next I do a hot "whitest whites" wash with Country Save. I have tried the recommended amount of detergent as well as about half that. I do cold rinses until I smell nothing. I've tried with and without vinegar. I also just started using Calgon in with my detergent. I think I've noticed a difference using it in my regular laundry, but not much of anything with the diaps. I also took 2 clean test diaps and boiled them for 10 mins in dawn, then tossed them in the washer for 2 hot wash/cold rinse cycles with no additives. Still crunchy, tho maybe slightly softer? I've tried drying on low, med & hi. Help! I'm using disp's now until I can fix this :(