Swim Lessons

My little guy is 2.5, and he loves the water. I swam competitively growing up and I had grand intentions of him being able to swim by 3 but we’re now approaching winter and our pool will close soon. We have had him in different programs since he was 9 months old, but he was able to do almost all of the moves in the parent and me class (goes until age 3) in January so we unenrolled and work with him on our own. But I’m not sure where to go from here.

Should I try to find him a private instructor that goes to indoor pools or join one of the larger schools again (Goldfish, British Swim school, etc.)? Has anyone had great success at getting your kid independently swimming by 3 with group classes? I’m open to anything!