Well, if the water isn't helping it's obviously not dehydration. The best advice I could give you is 1: lay of the cigs, and 2: even if it means taking a long drive and picking up large amounts at one time to get more quality shit, it's worth it. Or you can just not smoke.