The big upside of Xantid is that it comes down so fast. If they can handle it with jittie we have already played our most important spells. Resolving our first Enchantress effect is the big thing. Everything else is way less important.
City of Solitude has imo the same problem as Choke. It comes down too late. At this point we probably got an enchantress effect countered or we had to wait until round 3 or four to even try to cast it.

I even was thinking about boarding in Mindbreak Traps against Control and boarding some other 2 cards.
Trap could help us to resolve this one important enchantress effect. It might look crazy, but if we have some in our side for Combo we could bring them in vs Control, too.