Add my vote to the "paint!" column. You will be dissatisfied if you move in all the new, well-organized things and have to look at the old, patched walls. Then (and this is experience speaking,) you will dismantle everything and paint so the whole room looks great. Save youself the extra step and paint while it's empty anyway.