alternative swim-related exercise when shoulders are sore?

I recently hurt my shoulder, probably from playing 6 hours of tennis with a friend. Swimming has always been a bit rough on my left shoulder, but now it's my right shoulder that's in pain. Note: I did swim a 10 K in Atlantic City in September; the tennis episode was about two weeks later. I played the tennis match (five sets) on a Sunday, went to Monday swimming practice, felt fine, but at Wednesday's practice, I swam butterfly, and this is when I noticed that my shoulder was sore. I continued to swim for the next two weeks after the tennis; usually, my right shoulder would hurt at the beginning of practice, but feel okay by the end of 3000 or so yards. Anyhow, now it's pretty sore at the beginning AND end of practice, and I will probably see a doctor at some point, but I am trying to back off a bit for a while to see if the pain is "self-limiting" as they say. Anyhow, I'd like to continue working out with my team and wondered if you all could send me ideas for reasonable alternatives to swimming with my arms. It seems to me that the basic alternative here is kicking--but my kick is pretty slow, and I think that I will need to use fins if I'm going to have any chance to keep up. I did an all kick practice last Friday, using fins at the very end, but these precipitated foot/arch cramps. I've always been something of a "purist" vis a vis the various gizmos swim companies try to sell us. When healthy, I tend to use a standard kick board and pull buoy occasionally, but not very often. Now I find myself hoping technology can keep me going! In any event-- Questions: 1) there are all these different fins being marketed: conventional rubber fins, split fins, flexfins, zoomers, and these odd looking positive drive fins. I did have some hip problems from excessive butterfly kicking a few years back, and I don't want to exacerbate/renew that problem. Does anyone have any advice as to what kind of fin would make the most sense for a guy who doesn't want to hurt his shoulder, doesn't wasn't want to hurt/reaggravate his hip, but does want to be able to keep practicing with his team? 2) most of my shoulder pain occurs during the late recovery, early catch phases of my freestyle stroke. It's a little sore, but not terribly, so during breaststroke. Have any of you out there switched temporarily to breaststroke during shoulder flare ups? 3) in terms of kick boards, any advice here? It doesn't kill my effected shoulder to use a conventional board, but I doubt this helps it, either. Are those V-Shaped "ergononic" boards worth using? Can you really hold these with one arm? Or would I be better off forgetting a board altogether? 4) any other suggestions on how I can stay in the pool without causing my shoulder further aggravation? 5) finally, and this is probably the hardest philosophical question of all to answer: any tips for dealing psychologically with being limited in your ability to pursue a sport/recreation/source of camaraderie that is extremely important to your sense of self and well being? Thanks in advance for any help you can provide. My wife thinks I should just stop going to the pool, but I suspect you diehard swimmers out there in USMS.org understand how addictive swimming is, and how hard it is for us aficionados to give it up even for just a while.