This article lead to me reading about vim's undo branches feature, something that I had really wanted for a long time but just didn't notice existed. Thanks!

http://vimdoc.sourceforge.net/htmldoc/undo.html#undo-branche...