I used to swim with the Masters group at the Mission Viejo Nadadores. That was a lot of fun and challenging. People of all levels swam there and the people were great. I would highly recommend checking out a masters swim program at your local club. I know it's intimidating but once you go a few times you'll be glad you did! Good luck.