Just wanted to thank all of you in this thread. :-)
I purchased a 3TB HDD, and stuff goes very much more smooth now. I concidered a SSD, but I couldn't be arsed to go through the hassle with reformatting, but when I do, I'll be buying an SSD and replacing my first 1.5TB HDD.