Shoulder pain:

I returned to swimming with a coach, going to meets with the masters team, second semester of 2004. The last time I had swum had been in 1968, at high school. Anyway, I am experiencing some right shoulder discomfort, in between workouts. I am also getting some paresthesia in both arms when swimming without breaks anything above 500 meters at a faster pace. To further confuse me, I did suffer a fall on to my right shoulder from a dirt bike on Feb. 8th. My group swims with a coach 4 times a week, usually doing no more than 2,000 meters. I swim on my own the other days, doing easy 1,000s or more with or without fins. What I am looking for is advice on stretches and tips in general. I also must say that most of my training is freestyle, although I do some butterfly laps and backstroke laps. Thanks for any help, billy fanstone (in Brazil)