You are totally right about elements count. Forgot that this was the first war with 8 elements...
That's a maximum of 9 games, so the rule stays and if your 9th game commencing
you may choose freely again.
Upgrade tokens are another good catch. Since (hopefully) they are mentioned in the actual post,
those decks must be build with original upgrade count (means minus the tokens).
Gonna update this.