" See definition by OED." The OED does not say a whale is a fish.
Note that a submarine may or may not be a fish under these terms. If an airplane can fly, can a submarine swim?