Valarian, lemongrass, and ginger root will work.
Chamomile is pretty interesting. It contains a considerable quantity of tryptophan.
In normal individuals, that has a calming effect.
However, in those who have hypersensitivity to the effects of cortisol (a genetic issue) OR produce too much cortisol (caused by poor feedback control, either genetic in origin or induced from chronic stress aided by periods of inactivity and poor diet), chamomile worsens the negative effects of cortisol excess or hypersensitivity.
Tryptophan induces cortisol, renin and aldosterone hormone release.
Aldosterone affects kidney function, body water balance and therefore, thirst response.
If you have a sensitivity to chamomile extract, chances are you also have a similar response to licorice root (including water retention and thirst).