will Vyekos tutorial do what you want?

ADAPTIVE WIDE ANGLE-tutorial

Just a comment though - rather than "dragging to 90 degrees" you can hold down (I think it the shift key but may be Ctrl) while selecting the points to create vertical or horizontal alignment (I don't have PS here at work to check)