Sounds like you have it covered, but wanted to add my $.02 regarding bare vs. complex environments for fish since it's a subject of interest to me. There's been other study of this in addition to the reference Rocksor already mentioned. Guppies and trout are two species I'm aware of studies on. In both cases they've found 'enriched' environments resulted in better brain development, smarter fish, brains more like their wild counterparts. So I don't do bare tanks, even for fry (never have, actually, but this substantiates how I've always reasoned on it).
Excerpt-- example reference:
http://nevittlab.org/The_Nevitt_Lab/PUBLICATIONS_files/Kihslinger and Nevitt.pdf
Excerpt-- example reference:
http://nevittlab.org/The_Nevitt_Lab/PUBLICATIONS_files/Kihslinger and Nevitt.pdf
We next show that hatchery fish reared in a more naturalistic setting in the wild had significantly larger brains than their lab-reared counterparts. However, relative cerebellar volumes were similar between wild-reared alevins and those reared in the complex treatment in the laboratory. Together our results indicate that, within the first three weeks of life, variation in rearing environment can result in brain differences that are commonly attributed to generations of selection. These results highlight the need to consider enrichment strategies when designing captive rearing facilities for both conservation and laboratory use.