Personally, I find tea to be a much stronger diuretic. Even herbal tea (zero caffeine). Coffee used to cause diuretic symptoms, until I reached the point where I drank it every day. I drink tea most days now, but the diuretic effects never subsided.
/rant. Bodies are weird.
