@Jeber Palates differ. I have the same pattern of behavior and what finally worked for me was 1) kidney stones and 2) advice to treat water like medicine and set alarms. I may also add lemon juice and a pinch of salt (or ORS) but that doesn't improve the taste.
Oh and don't get kidney stones holy hell