Definitely drink more water. Many people, whether they vape of not, don't drink nearly enough water on a daily basis. I have to constantly remind Mrs. 'tude that soft drinks and iced tea are not water. I think in her mind, water = liquid which is so not right.
If you've made a connection between the ache and citrus flavors, no matter how much you like them, different flavors are a good start.
If you do see a physician and you're comfortable with sharing the results, please do let us know.