UK to rework Swiss tax deal as it falls foul of EU