Did Noah collect two of each type of saltwater fish?

Yes, and two of each fresh water creature as well, since the salt water oceans would have raised the salinity of the fresh water.