Hi I've found that for me the mesh warp tool in many cases works better for straightening than the other options. Maybe include it if you ever update
Two advantages:- you can drag your picture outside the canvas, so you won't have to crop the empty edges afterwards
- you don't "break" the lines in buildings, for example here http://www.panoramio.com/photo/121475550