You can pull a almost-complete rebuild with nigh-SOTA parts for
less than $1200... It's a great time to upgrade. :)

On the subject of laptops, I'd still wait a tic or two, they're pretty, but the tablet PCs that are coming along are looking to be seriously drool-worthy... (Competition == Good)