Thanks for the replies. Is haswell going to be a huge improvement? The article says around 10% speed increase per mHz over Ive Bridge. Maybe I will wait around for this, its not as if Ivy Bridge is going to get more expensive in the mean time if I decide to go that way.
Yes an SSD is definitely on the cards. I would hate to think how old my seagate 160gb windows drive is. SSD prices are starting to become a lot more reasonable especially for sizes you can actually use, 200-500gb for steam games etc.
I'm not really into overclocking too much. I will see if my megahalems fits or get whatever noctua have at the time but usually 300-500mHz increase is good enough for me.