For photography and files only in the 40mb range, I see nothing wrong with your system. If you have money to burn (sounds like you do) I would make sure you have enough on and offsite backup drives for you photos.
I'd use some money to set up a small RAID, as the HDD's will be your main throughput bottleneck. I don't think you would probably need much more CPU horsepower.