I think having Surgical against Affinity is a bad idea.
The only consistency they have is Thoughtcast and Bomat Courier, neither of which see much play. They also have few payoff cards, especially ones that are still relevant through Bridge.