I'm super crappy at programs, so this may be useless. Straightening stuff in PS (with that 'arbitrary' rotate tool, guessing the degree?) makes me crazy. I've discovered while not-at-home that this application Fotor, which is a web based editing thinger (I've got a chromebook to work with), has the most gorgeously intuitive straightening function I've ever seen. Maybe Lightroom has something like it. Maybe I'm making things hard on myself because I don't know how to use PS very well. But if you want, this is Fotor:
http://www.fotor.com/editor/index.html eta: I should mention that everything about me is crooked; mind, body, morals... photography skills (heh, "skills") are no exception. So. I was a little excited about the ease of the fix with that app. :x