This once again reminds me my body is odd.
I actually have a soda stream for the carbonated water because the carbonation settles my stomach. As do carbonated energy drinks.
Over time (years) my body has finally gotten used to flat water in most situations except the morning.