I've actually done the entire move except for the NW Frontier Diorama. I cleared a space for a table to put it on, and the room actually looks more spacious right now.
All the other stuff in the room has been moved out into the main room. I used the desert base I got from K&C at the show to set up all my old glossy K&C marching bands. They look really cool marching together.
I've set up a few shelves of Figarti display, and its starting to look quite good.