My workflow is very similar. I think you might get some benefit from a tiling wm. I use DWM personally, but you might want to check them out