I have 2 rooms too but the other one has all my weaving stuff in it, my loom, all my warp thread, plus fabric for weaving AND WE AREN'T EVEN GONNA GO THERE!!!!!!!!!! LOL.
the box idea might work but I am not sure how I would organize that, do you sort out the stuff in the boxes into plastic bags or how do you have it sorted inside the boxes?