Did you try the Hamad aquatic center behind Villagio?