Definitely keep us informed on this one. I know your S4 was an early one but I do wonder what, if anything, was changed from the S3 to the S4 (location of key electronics, etc?).
Water ingress and Morgans do not a happy relationship make (I had enough water issues with my S3 to experience that first hand), so it would be good to hear the findings on this one.