This might be a really nice trick. Use the technically meaningless "merge" commits to deliniate the 'commit groups'.

It limits how commits are grouped a bit. But that limitation might be good to prevent feature creep.