Hm... are you sure your kH and gH test is correct out of the tap? Or is your TDS measurement in degrees? Generally, if you're using a TDS meter it will measure in ppm, whereas the kH and gH tests are in degrees. In which case your TDS should at least be ~38.
Fish Shrimp tanks are like cups of coffee, one is never enough.