Rather than guess, I might float around some of the local shops and ask them what feels right in the local water. then I would look at changing up the livestock choice if neither of those are right. I find fighting nature is not my cuppa and it works much easier for me to find one of the thousands of other choice s that might better fit my tap water.
Your water is pretty much mid range so I would look for mid range livestock and if totally bored with the common ones everybody has, I would look for some of the oddballs that fit the water better.
But then choosing fish is full of as manner hazards as choosing girlfriends. We each need to figure out what we want/need? Some are worth the effort and some are not.