I want to install Windows 7 (not till release, though), install a new/bigger OS disk, and upgrade the motherboard/CPU.

I can see arguments for all kinds of different orders for these tasks.

I don't game much, so I don't need more power for that, but I do a lot of photo stuff, and Lightoom/Photoshop want More Power.