I've been back to the pool, and it seems I have found my groove, so to speak. Up to 2 sets of 12 continuous laps. Just slowed down, and remained relaxed. I can see working up to a mile in the pool. The contrast to how I had been swimming is so amazing. It's so easy now, I can focus on parts of my swim instead of worrying about if I would be able to complete any given distance.
It's awesome!!