I am in a similar boat about swim school. Adult and comfortable in water, but would love to learn it the right way. After initial research, I found British Swim School which has many locations in the area. They are supposedly slightly more expensive, but I prefer convenience. They have 3 locations in the city including a new one in The Heights.