Square rooms should be avoided. You will have a hard time overcoming the limitations and acoustic issues of a square room by upgrading any of your components. If the spare room is your only option, I would seek help fro GIK before doing anything.
J.Chip
J.Chip