Quick question: by /usr separate from /, do you mean that /bin for example is just a symlink to /usr/bin or that / and /usr are on the same partition? Is it ok to just merge the two by doing:

#mv -r /bin/* /usr/bin
#rm /bin
#/usr/bin/ln -s /usr/bin bin

For all of the directories in / (root)?