It would be useful if you could keep the selected overlay when rotating the Crop tool and not just default back to the square grid (maybe by using the Cmd-key?). You might want to line up to something else than just straighten a photo (which I assume the square grid is for) and I have not found any way to do that.