Help getting caught up to speed. What GPU would be best with the current OSX software (and give me no issues)?

Here's my current rig. https://pcpartpicker.com/user/rcolem87/saved/bfBjpg

​

The GPU always gave me issues (and for the matter Messages). So I ended up leaving the project dormant for about 4 years now. I have a work-issued MBP that got most of my work done.

​

But lately, I've been feeling the need to get it working again as I do a lot of photo/video/audio production. The hack hardware might be old but it's definitely more capable than my laptop when it works right. So I'm thinking of wiping it clean and starting as vanilla as possible. But I really want to make sure the GPU works in harmony without any headaches.

​

So based on my setup can anyone suggest a good card upgrade/swap that will be a safe bet? I don't need the latest and greatest, but something that can handle basic editing would be good.