Ok so I have tried all kinds of combinations, and I ended up sticking closer to my original deck. I'm becoming more experienced with this deck, and opponents using unfamiliar cards, so it seems to be working pretty well.
I've tried teammates, muscle bands, judge, gengar, float stones, puzzles...