For viewing and editing photos, I'd definitely go for a retina MBP if you can afford it (in terms of price, size, weight). Simply put, the screen matters for your use case. A LOT.
The most consistently worst part about Apple laptops for me has been the screen. Glass multitouch trackpads rocketed Apple to the best in the biz, the move to x86 nixed the PPCs that just couldn't keep up, but until the rMBP the screens have been horrible. Sure the review sites would tell you that for TN panels, the gamut, color accuracy, and contrast were decent, but as we know specs aren't the whole picture. TN panels have horrible color saturation shifts at different vertical viewing angles. The IPS panel of the rMBP fixes that. Now you have desktop-level resolution, and desktop level color consistency across viewing angles. Now you have a laptop that you can edit photos on without having everything wash out because you sat up in your seat a few inches. (And if you fly coach, you can now sit in a cramped seat and look down onto the screen with much better color saturation.)
But as others have said, wait 'til the end of the month, when Apple is expected to announce the next-gen, Haswell-bearing, rMBPs. That also gives you another month to save up for it! http://www.macrumors.com/roundup/macbook-pro/