If you make it "much easier" like that, you have a bunch of labels which may be easy to apply but which tell you nothing.

Hint: look at "Click Go the Shears", which is about as familiar a Kiwi folksong as you'll get. It isn't in any of the modes you listed. (Someone trained in Indian classical music would immediately figure out what's going on there). Give it the right modal description, and it starts to look pretty puzzling, since other tunes like it are very remote in space or time - where did THAT came from?

A good theory doesn't just categorize things, it creates mysteries.