So we moved since I posted in this thread, this is my current setup:

Needs some work on organizing storage and something for the V-Amp so I can turn it on and off and use it without it occupying a third of the desk.
The guitar (lower left corner) would also benefit from a sixth string (the high E-string snapped while I tuned it a few days ago, but it makes sounds - at least when the dodgy switch decides to work - so it fills its purpose).
The greatest benefit from this new workspace is that it's about five meters from my front door, the old one was about two hundred meters away. So much easier to steal five minutes worth of soldering when it's close.
The greates problem with this setup is that I put the shelf above the "desk shelf" too low, so my multi bin storage thingie has to reside on the floor, though it does leave a little more space on the desk.