Lens distortion can often be rectified very swiftly with the Transform tool. Simply by selecting the various parts of the image and dragging to the desired position.

With the before and after below - the image corners were just pulled in a matter of minutes.
( Just remember to shoot allowing for the editing process )