Nice!!!
Have you thought of mounting your (speaker) monitors and (computer) monitor on the wall? That would allow you a lot more desk space. I wouldn't mount the monitors flush, but most studio brackets would keep it off the wall as much as you have them now. You could even mount them around the same height, but it would allow you to push back the Yahama and give you more room to work a mouse.