Project Organize!

OK...so I feel like a generally organized person.  My problem is I don't really know how to work with our temporarily small space...do I really work on organizing when we have less than a year to go or do I go organization crazy?  Until today I have taken option 1. 
It's not working for me. 
What do you do when you have 2 homes worth of furniture, a baby who has grown out of things and is getting ready for new things, and a ton of treasures collected from all around Asia...and all of this stuff in a two bedroom apartment?  We don't want to get rid of furniture until we are in a more long term home and we know what we need, we don't want to get rid of baby things since we plan on having another (or more), and we LOVE all the amazing things we picked up in our travels (we were very intentional and picked out useful things like platters and vases or decorative things like paintings.  On the surface our apartment is really cute...but don't open any doors.  Zack's closet is literally jammed packed with golf clubs, a baby swing, a jumparoo, baby toys and clothes, the next size up of clothes, and random pieces of furniture.  Our closet has all of our clothing (Adam has a lot since I had the tailor make a ton of pants and shirts for him before we left China...me, well I have maternity clothing, nicer clothing that I don't wear because by the end of the day I am covered in graham cracker mush and sticky versions of whatever Z-man ate that day) plus several boxes that I haven't opened and extra bedding sets (for a future guest room?).  The pantry has several wedding gifts still in boxes (not because I don't want to use them but because boxes are much easier to store), the platters and bowls I mentioned before and all our food.  The coat closet has boxes stacked up under our jackets and on the shelf.  The linen closet has well...who even knows (I try not to look in there).  Our laundry room is packed with shoes (Zack eats any shoe left out and I still have the streets of China in mind every time I see him put a shoe in his mouth), paper products (in bulk...bad idea for space...good idea because these tend to be the things I forget to put on my grocery list), and more food and cleaning supplies.  Our "office" is the catch all...it's behind the gate so I throw anything on the desk that I don't want Z to get into.  I clean it off once a week, I honestly don't know how it gets soooooo bad.
There it is...my deep dark secret is out (did I mention that we also have a large storage unit filled with boxes and I have my Christmas decorations and other unopened boxes stacked up in Zack's room).
THE PLAN:
Do one thing at a time (and be OK with a little mess until it all gets put in it's place).  I plan on simply re arranging first.  Then I will make a list of bins and what not I need (I have set up a budget) and make only one trip to pick up all my supplies.

These run on sentences are making me look totally scattered and thinking about all the unopened boxes is making me feel less proud of the fast unpacking job I did in September and October.  Right now it is 2 am, and I am so restless I was planning on starting on Monday but I may just get up now and work on the pantry.