I also used to struggle with the swim, a workshop with total immersion has changed that I can do 1000 meter in 15 minutes or less consistently. I highly recommend looking into their program, not only do I move faster but swimming is so much easier I come out of the water fresh and relaxed, where as before I was typically exhausted out of the water and recovered on the bike. It does pay off -