Which phone did you upgrade to? I also have the 7T and quite happy with it except for brightness outdoors

I have been to Iceland recently and tap water is absolutely fine to drink directly and preferred. No one there buys water. Just make sure you drink the cold water and not the hot one as the hot is from natural thermal springs so may contain some minerals I belive. Just carry your own bottles and you can fill up the cold water from anywhere, even restaurants will refill free.