I want to use the 2-finger, track pad, rotation feature while I work in Photoshop, but is there a way to get the image back to perfectly straight up and down?
your best bet at that point is probably to enter rotation (or free transform) mode and hold shift as said above... I don't think there's a lock or snap feature in the two-finger rotate.