Du zhong (also known as Eucommia bark) is an excellent kidney tonic. It's actually one of the herbs in a Chinese formula called KB-C (code name for Kidney/Bones-Chinese).

I would also recommend adding fresh lemon or lime juice to your water whenever you drink it. Fresh peppermint leaves are also beneficial for their anti-bacterial properties.