About the water inside your lens, I was shooting the Riverbanks Zoo in Columbia SC and it was sprinkling rain. I was using my Canon EF 70-300mm f/4-5.6 IS USM Lens and water got inside the slide area of the lens. When I returned to the motel I took a bunch of tissues, zoomed the lens back and forth, drying the lens barrel each time. I shook downwards, I shook it upwards, I zoomed, dried, zoomed, dried for about an hour. Eventually no more water appeared on the lens barrel when it was zoomed in and out. I now carry an Eva-dry Renewable EDV-300 inside my camera bag.
I don't know if that procedure will work for you but that water got inside your lens somehow so it should come out if you can develop the right procedure. If you send the lens off for repair, be sure to tell the repair station everything that happened and everything you have done.