Ok, just spent an hour re-assembling it. It's much better now.
The middle compartments no longer push up on the top panel ledges, so now the top panel lies mostly flat.
I used the space behind the PSU for cable management.
Will upload pics later, but I am a very happy customer. ?