Hmmm..between those two choices, I'd probably go with the Lens Doc filter. While PS already has some transform tools that can do the same, they are a little bit of a pain to get to work well fixing this kind of distortion. This looks like a faster, cleaner interface for doing it. And then add in being able to do rotational fixes at the same time. My 2 cents. :) Do I get another snuggly for being helpful? :)