I've finally settled on Sublime Merge. Same speedy interface as Sublime Text along with the visual history/branching/diffing that I need, but with a command palette that basically functions like a souped up CLI. I do still go to the CLI when I'm doing simple commits (or really weird complicated stuff like resetting to two commits previous to HEAD), but I probably get 85% of my work done in Sublime Merge. The tabs for multiple repos is also great. Totally worth it as far as tooling goes.