I'm really similar. I hit a point with multiple monitors where I realized that the extra space was more of a distraction than a help. I now use a single monitor/full screen 90% of the time.

I use Contexts.app to search through all of my windows and so that task switching becomes more consistent/muscle memory-ish, which was really nice for staying in flow. I also use Spectacle so that I can easily window arrange for those times when side by side windows is useful.