I am not any kind of expert in this area but with the limits you described maybe try this. There are many herbal teas that have great flavor without adding sugar and have no caffine. Put them on ice and it can be quite refreshing. I know of apple & cinnamon, red raspberry, orange, red zinger and berry zinger. It goes on. At least it will flavor your water!