I think my Ubuntu is a bit broken from messing around with it.
Unfortunately during installation, I did not make a separate partition for /home. Now I need to re-install but want to keep my music and films.
Ubuntu has always supported this, but it's hard to kill the myth that you need a separate partition in order to preserve your data. Stick the CD in and just reinstall over it: