Don't exclude the possibility of Elf soldiers. I know we already have a bunch of elves, but I'd be upset if we didn't get at least one of them in their awesome new armor. Also, if the war chariot were to appear in a set, I'd imagine that it would have been Erebor due to the characters on it and where the chariot is charging from, unless somehow that is the same carriage that Dain arrives in (it's being pulled by rams, which most likely means that it was made by the iron hills dwarves). I'm not saying that your predictions would make a bad set, but don't forget, there's still lots of things from the battle that we haven't seen yet that may appear in the set. :)