You might try just drinking a bunch of water.
Medication can help, but your body is still used to physically drinking a lot of fluids. So just like smokers use toothpicks or whatever, it might help for you to replace your physical habit as well.
If you find yourself anxious, try exercise or a fast paced videogame to work it off. Just in general find things to keep you occupied. All the shit that you've been putting off, start doing it. You need to show your brain that other things can trigger rewards than dopamine.
It could take a while.