Hardware question

[Seacat]

Hi all,

back after a long time.... gout in all joints and an allergy to a drug, but by the day i feel better... so i hope to start making panorama pictures soon again!

Question: What is the best solution for faster stitching gigapixel
panoramas (software i'm using: Kolor Autopano Giga 2.5) :

Exchange Intel i7 930 quad core (8 with Hyper threading) in my system for a Intel i7 970 six Core (12 with Hyper threading)
or
change my raptor 10.000 rpm harddisk and swap it for a SSD harddisk.

More memory is possible om the x58 mainboard: there is 24 Gb in the system.

Thanks all!