You seem to have stumbled on the fact that fish is not a useful term because you cannot come up with a consistent definition of fish that doesn't include beloved character actor Margo Martindale without excluding things that are obviously fish. It's the same with "tree".
You are correct that dinosaurs are not birds, but birds are dinosaurs in the same sense that you are a mammal.