Consider adding face alignment.
- Click the face you want to align.
- Then click the face you want to adhere to.
- The first object would move to the second.
- Assist with alignment issues when you scale something that is not quite on grid.
- It would rotate the faces to match allowing you to use local transformations