I habe always used Partition Magic in the past.
I recently purchased a copy on line, needed immediately, on site at client's site. Could not download it, got horrible support,4 hours on the phone, canceled the order. I then purchased Partition Commander from VCom, used it effectively, no issues. Almost identical to Partitiion Magic, cheaper, and no support problems.
XP-PRO does have partitioning tool in OS, but it needs some unallocated space or you cannot use it. If you get new drives in the future, make sure that some free space is made available at the beginning so that you can use the built in Disk Partitioning tools.
Is it necessary to make one large partition? Keep the 2Gb partition and use for the swap files for increased performance. That will also free up space on the primary that is being used by swap file now. So you get the space on the primary, get better performance, and don't need to merge partitions.