It would seem to me you would be well served training snatch, cleans, jerks and push presses, bent rows, seated rows, chins/pull ups. I would not ignore the legs, and would suggest including at least some deadlifts, front squats and overhead squats. Some heavy and light kettlebell or dumbell snatch and swings would probably benefit you too.
I would also think a variety of carries and walks would help out. Check out Dan John's DVD "From the Ground Up."
This kind of training benefits all athletes....even those sitting on their butts swatting at the water.