Now would be a good time to use a Puppy Live CD to mount the messed up Ubuntu
partitions and copy stuff off to USB or extra space on WinXP drive. Re-install
Ubuntu 10.04 or try 10.10 and partition Ubuntu hard drive the way you want after
you decide on version, etc. Then you can mount both hard drives in Puppy and
copy stuff you want back to Ubuntu. Or perhaps you prefer Ubuntu for this?

Have fun, I need to buy the new version of Partition Commander, too, but I just
got the SystemSuite 10 for the WinXP computer.