New Training strategy...thoughts????

I've been very consistant with my training since last August, trying to make a big push for Spring Nationals in Indy. I've been swimming 4-5 nights a week 3-3500 yards a practice. Also been doing Crossfit workouts in the AM 3-4 days a week with one of those days working on Olympic lifts. With the Crossfit I have seen a marked improvement in my leg strength especially in the pushoffs from the wall. Lately I've been dealing with a little pain in my shoulders...nothing accute and not any pain through range of motion..more like a dull achy feeling. I've taken care of it with Advil and deep tissue massage every 2-3 weeks so its managed and not getting worse. I decided 2 weeks ago to stop doing straight up swim workouts 5 nites a week and instead alternate between regular swim workouts and just dedicated kick workouts. When i do the kick workouts I still do a solid warmup and the workout is 2-2500 yards of kick sets. i move into the slower lanes of my Masters Group to accomplish this. I seems to be helping with the pain and my kick is already improving big time. Has anyone else tried to do this type of training split???