Gosh, be careful. Don't monkey around too much when it comes to the kidneys. Kidney's can be damaged and have irreversible problems leading to serious problems later. Dialysis is not fun.
To add to the list:
Oregon Grape, check that out too.
Horsetail...check that out. Some folks worry about the silica. Used properly it shouldn't be a worry. I stick to the tincture or tea. Most definitely do not use it all the time as a preventative it'll deplete your thiamine levels. A lot of controversy so really read up. You may not feel comfortable using it. I personally have not found any problems. Get it from a good source, because some places don't know what they are doing and a likeness is used unknowingly.
Yarrow
Marshmallow
Think along the lines of diuretic, astringent like dandelion, but also don't leave out the mucilage.
wanderingherb