CtrlP + tabbar has done a lot to make this Emacs user tolerate the occasional vim outing.