Well Kami looks like you covered most of it there is also Athens scuba park ( i have not been there ) but i hear it is nice. There is also Medina lake , Boerene Lake ( man made and no motorized boats allowed, small but can get to 30 ft in depth some structures to see too.) Lake Amistad aswell. Just keep in mind that lake diving usually has poor viz especially when it has rained recently, I dive Canyon lake most times and have found viz at best 15 ft. Rivers ( comal and quadalupe)are also a good place to go diving depth is usually no more 20ft and viz is better most days and if you are lucky you just might find some treasure. Hope this helps a little. need anything else just ask. Travis