I'm in the same boat, but instead of upgrading I'm thinking a new computer. For you experts, I'm looking at Circuit City and the HP m8430n, Take a look and tell me what you may think. I would like to add that I will eventually get an exteral hard drive, but plan on using this machine strictly for photo/video work. I do mostly underwater video and will use U-Lead 11.5 Plus.