I understood the numbers to only contain farm fish and no wild fish. Thanks for the fact about elephants, I didn’t know that. A better metric might then be the number of neurons in the cortex. But it would still contain a lot of uncertainty about which regions of the brain are actually causally responsible for suffering and so on.
This might be of interest:
Some whales/dolphins have more neurons in their cortices than humans.
That being said, I’d be reluctant to rely too much on raw counts to decide moral weight. There are many other considerations. Check out Jason Schukraft’s work for Rethink Priorities.