Horrible Heartburn from Water

I love water so much, but with this pregnancy (my second), me and water just don't mix. No matter what I mix with it , I'm either gagging or my heartburn is through the roof. I've been eating TUMS, but they only do so much! 😣😣 my skin and body is feeling/showing the avoidance of water but these past two weeks I've been chugging no matter what. I know my baby needs the fluids so I just suck it up, but I can't wait till this feeling is over. What's worse is we only drink water or Almond milk at home haha😅😑😭!! Anyone else having this issue? How are you dealing?