After all is said and done, you may find that you really don't have straight lines. even when corrected for perspective. In that case, a lens distortion correction tool like the one built into PS CS or the exceptional PTLens plugin should be applied before Pespective correction.
Don't work on the original scan file! Make a copy.