I would personally purchase the baseline Macbook Pro and a 20" Cinema display. You wont find a better screen for less.
Really? But how fast is the baseline MBP? The only differences between the baseline MBP and the 17'' seem to be processor speed and GPU memory. I'd be doing alot of Photoshop intensive things, and for that isn't GPU and processor power important? (Also, if I got the baseline MBP I'd get the 23'' Cinema display since it'd be the same resolution as a hi-res 17'' screen