I'm the same way. Chasing code changes through the codebase then fighting with an edit rebase stack trying to explode them into less-interlocked changes.

It doesn't always work, sometimes I am just committing a giant blob of changes at work on my project I near-solo maintain 💀