I have an almost identical setup. Great stuff to work with. I just switched to iTerm for the exact same reasons too.