You want to have the second one. Last time I used it, it worked for me - kept all the data intact, resized partition the way it should. That should be what I'm interested in, indeed.
Well, but how? I tried PowerQuest Partition Magic, but that silly shareware doesn't do anything.
Also, I don't think I should use fdisk for this, as it might remove my data.