Model for the high-temperature oxygen-ordering thermodynamics in YBa2Cu3O6+x: Inclusion of electron spin and charge degrees of freedom.