While you are apparently beyond convincing, I will post a detailed reply later from ALL THREE books that explain the metaphors so that there is no question.
Using the books to explain the “real” meaning doesn’t work because most people haven’t read the books. What matters is what the movie means by itself. That’s what most people will take away from it.
For instance, you talk about there being a states rights theme because the Capitol oppresses all the districts, some of which are probably middle class, and not just the po’ folks of the coal mining district. Well, you really don’t get a sense of that in the movie because the other districts are either glossed over or not presented at all. Instead what you get is basically Marie Antoinette vs. the coal miners, which is about as blatant of a class warfare theme as one could possibly think up.