There's a couple more options.
Partition Magic can move everything onto one drive and the other can be removed. The remaining drive can be resized to maximum. All without losing data.
You can increase your RAM (I'd suggest 256Mb minimum) and do away with a swap file altogether. That's what I've done and it works fine.