I like the current organization better than the one you present.  Demographics is important for exactly Cunado19 reason, and other religions is important as well due to the teaching of Progressive revelation which is a fundamental teaching of the Baha'i Faith.  Invovlement in Society could move up, and symbols and calendar can be switched.