I loved this issue. You are right though, the whole bit on the water planet felt superfluous. Although I bet you it's going to crop up later, they devoted way too much space to it for it to just be a throwaway, unlike say the Doctor's introduction, which was just a way to introduce those characters to us.