The MacBook Pro, Intel i5, 4 GB RAM, 15 inch, 750 GB HD, or iMac i5, 4 GB RAM, 1 TB, 21.5? For DSLR photography and for Word and PowerPoint and Excel?
I just got a 27" iMac...and I want to play with it more than I do with my MBP. lol...The screen on the iMac will definitely help with photography/editing. But with the 15" HR MBP and an external display, you'll get the best of both worlds.