Similar to Keio, I bring 2L water (boiled at home, don't use distilled water ah) for my 10 days hokkaido + tokyo trip in July, and mix with those tap water but boiled at hotel. Use more proportion of your own water in the first few days then you can reduce the proportions. Even in the last day we use some water bought in FamilyMart, he is ok ah.