Okay, I noticed that barberry is also diuretic and that both it and golden seal are catergorized under tonic herbs in the book.... So I looked at other tonics and found a few that aren't diuretic but have valuable properties regarding digestion.
The book says that Columbo resembles golden seal as a gastric tonic. Also balmony and gentian look promissing.