Should I change my Character Card Decks?

I guess I should also mention that I only have 1 open slot and that's for Zero, unless we get a cap increase + free slots. So I can't really make anything new.

Also, I couldn't stand Mechanic, plus I have +105% Buff Duration on my primary main already.

I'm primarily wondering if there's a better setup I could use with what I already have.