Yeah, I finally pulled the trigger and went with the Galaxy S2, despite the size, Touchwiz, and end-of-life. However, wi-fi calling is too important to me (office buildings, apartment, etc).
Also, while the camera on the HTC One S is fast as all hell, and the pictures are beautiful and...