Geometry: Draw Guides skews image

The Geometry tool in ACR doesnt work on images where the camera is not level.

I usually use the Draw Guides option, but also have issues with the vertical options. It skews the image instead of rotating it before applying corrections. Any angled crop correction is either removed or applied after the tool has already skewed the image.

Allowing rotate to be applied before geometry would fix this I think. Another workaround would be adding vertical and horizontal skew correction sliders.

I shoot a lot of architecture and interiors and usually can keep my camera level, but the odd time I have to tuck the camera into a corner sometimes it gets angled a little. Pulling one of two photos from a shoot into photoshop (and then making separate save file) to correct this is a pain for my workflow. 

Attached an example with just a rotation and then with geometry: draw guides applied