About the photo editing:
How much "professional" you going on?
Light editing only? Or using many layers with effects?
This is what will define if I say to you to go for a full i7, or a i3/i5 cpu.
Just don't scrap AMD out of the game yet. Their APUs would shine in your build.