Hit up one of the local quarries for refreshers. And of course a class if you think it is warranted.
Blue Lagoon #1, great because you can't get deeper than about 32 feet for refresher and even when it is murky it is generally light-ish.
BL #2 is murky and dark. I don't know that I have every seen clear patches.
Lake Longhorn. Parts can be clear, parts can be a murky. Can get dark. Does have fish.
Mammoth Lake, recently re-opened. Parts can be clear, parts can be a murky. Can get dark. Can get deep. I think that of late, the training platforms in Mammoth are some of the clearest water around. They are suspended at about 18 feet well above the bottom so that the students aren't kicking up a ton of silt. That said, other parts of the lake can be incredibly silty and dark. Right now, this is my favorite. Partly because of the new novelty, but also for the clarity. And unlike BL, there are fish and critters.