Macbook Pro. I have one and I love it. My husband is a semi-professional photographer and full time computer guru who has every gadget you can think of and he also has a macbook pro. I asked his opinion and he said that if you are planning to edit photos, you're not going to use an ipad because there is no photoshop on the ipad. You can use other programs but they are not as good as they don't allow you to edit raw images.
Good Luck.