Partition and drive letter problem

Hello
I got a really annoying problem that i dont know how to solve and i am a little worried about my disks health.
The drive is a SATA2 with two partitions, one small 50gb which was systempartition with XP and drive letter C: and then a 200gb storage partition which had the driveletter D:

It all began when i was about to format my system partition (former) C: and re-install XP, i did it wrong the first time, it didn't format the drive just reinstalled XP so next time i deleted the whole C: partition and was about to
create a new when it suddenly got the drive letter D: and my storage partition got drive letter C:

And somehow it seems that the storage part. also made itself a systemdrive and maybe even boot (not sure), it has these files on it ntldr, NDETECT.COM and bootfront.bin.
And beeing a systemdrive i couldn't change its driveletter the easy way in XP..

So now im stuck with a XP on D: (and i dont even know if its a systempartition anymore) and a storage systemdrive with C: as drive letter...
This has created big problems with my Dual-boot with Ubuntu, and i want the small XP partition to have back C: and be a systempartition and the storage partition to go back beeing just a storage partition!

I am in need of help... i havent dared to try any commands in the recovery consoll, not dared using partition magic or such to try and change letters... im just afraid that it will screw up the storage drive somehow...

Thanks!

the only time i had problems like that was a memory card reader hooked to a USB port, when I tried to partition the hard drive I had 4 drives automatically, then came the hard drive partition G: for the OS, you may get to start over to fix your problem, I am assuming that you went into the control panel and tried the Administrative Tools already