Too bad about the computer desk, surface space is one thing I'm a little short on. Any chance you can dissemble it and strap it to the top?
Bookshelves, eh, we should be able to find some of those cheap. I've got shelves but they are of course at capacity.
It's a big corner desk...so I dunno that it would work. What I'm thinking, though, is that I might be able to find a nice big old desk once I'm there - paint it, if need be. I have a laptop, so room for cables and space for a tower isn't an issue - writing space is.
Fixing something up could be a lot of fun!