This has become my approach as well. Create a work tree per larger thing / batch of things and manually review everything in small commits, then squash merge the whole tree to keep the history manageable and clean.