I'm looking to upgrade my current setup after this years WWDC, and I'm stuck between two options at the moment. A tricked out 24" iMac or a baseline Mac Pro and 23" Cinema Display. The uses I need from it are pretty simple. I like to work in Aperture a lot of the time, and do occasional video editing. Not more than a few hours a month though. The main use of the machine will be Pages+Mail+Safari+Skype+Transmit+Aperture+Final Cut Express+Photoshop CS3. Reasons why I want to upgrade: I need more RAM I need more HDD space I need a larger screen I need a better video card These are all things which I can easily upgrade on a Mac Pro, which seems to me as if the main deciding factors of me "wanting" a new computer are crossed out with the Mac Pro, as I can upgrade just these things, where's with my current iMac I cant. How many years do you think I could get out of: A: 24" iMac up specced. OR B: 2.66 Ghz Mac Pro, 23" ACD (thats the only details you need to know as all other can be upgraded easily). The difference is around NZD $2000.