How long to forego swimming after shoulder pain

I'm 29 years old and am getting back into swimming (swam for fun as a kid, but never competed or anything). Previously most of my exercise was in the gym lifting weights or cycling (in which I used to race in college). However, I'm looking to swim more since I'll be moving to a colder climate in a couple months. Anyway, so I've been swimming for a couple months now. About 2 weeks ago I went into the pool and did some laps freestyle with a pull buoy. While doing this, I apparently was not rolling my body very much (which I knew at the time but simply thought that the pull buoy was preventing me from doing so and so was the expected way to do the drill). Anyway, during the end of the drills my shoulders started slighting hurting. I finished the workout however. The next couple days my shoulders were fairly sore, although definitely not too painful to move. They just felt sort of like I had received a shot in each shoulder. About 4 days later I swam again. This time when I tried freestyle stroke my shoulders just felt really weak and powerless. I hadn't slept much in a couple days, which probably didn't help me either. Instead of continuing to use my shoulder during this workout I instead just threw on the flippers and did leg-work. It's been 2 weeks since I last swam, and my shoulders generally feel pretty good. However, my left shoulder still feels slightly off, and if I stretch it well then it does feel different to some degree. While I wouldn't really call any of this "pain", it's an odd feeling, somewhat similar to the 'shot' feeling I described earlier, although not nearly as acute as it felt the day that I injured it. It's minor enough that it's the kind of thing I wonder to what degree it is just in my head. Anyway, any pointers on how to proceed? Others who have experience similar situations? I'm sure that many people on these forums have been through much more serious swimming injuries than this (and likely at a time when they couldn't easily stop swimming). I miss swimming and would like to get back to it, but if I'm going to injure my shoulder again and make it worse I don't want to risk it. I can happily cycle for quite some time and give my shoulder a break from swimming if that's what it'll take. Thanks for any pointers you can give me!