I signed up for a new group swim at Aerofit in Villa Maria - MWF 11:00-12:30. It's more for folks that sound like what you're looking for (I'm in the same boat as you). The instructor swam in high school and for A&M, I've been the last 2 weeks now and have learned a lot from him.
The deal there is you sign up for 3 months minimum, and then goes month to month after that.