I have no idea how much your tap water is chlorinated, but I'm quite sensitive to the stuff. If someone cleans with chlorine bleach, my airways start to close, even if I'm technically not allergic. IF the reaction is because of increase chlorination, you could try following. Pour a liter of so of the water in a more or less open jug. Let it sit on the counter or in the fridge. Don't drink from it before 24 hours. Chlorine evaporates naturally after leaving the pipe system. If that makes a difference or not could hint you towards further steps.