its the usual ask 100 people and get 100 different answers...but from an unbiased non-team driver perspective :-
having owned both and purely from my own point of view, there is absolutley no question that it has to be the S2. only the S2 remains now and i'm so happy i made the swap. i agree it's expensive but you
do get what you pay for.
spares backup for the S2 is still as good as it ever was so don't worry about that
i could write about why i made the swap but it would turn into a rant about the x-6 and i don't want to get my blood pressure up....
suffice to say, i'm happy with my S2 and i'm sure you would be if you got one.