When will the spitting and water intolerance stop

Hey gals, I'm currently 18 weeks pregnant. Ive suffered from extreme vomiting and nausea from week 11, it slowed down allot but I still have vomiting issues and I still have issues with nausea and indigestion. However I haven't bin able to drink straight up water from week 13 it causes me to vomit, should I start forcing myself to drink water or should I try Wait it out. Another issue I have is spitting, I CANNOT for the life of me swallow my own saliva it automatically causes me to gag when unintentionally do it. And when I fall sleep in the night and unable to keep spitting it out I wake up in the morning with a sour stomach and have to vomit and when I vomit my saliva comes out. I just wanted to know if anyone also suffers from these two terrible symptoms like me and when did they stop for you