Demand for officers is less a problem than a solution in the medium term.

Kill 2/3 of staff positions, assign the officers to line units in new command jobs.

They'll be happier and you solve the staff madness.