I say Xs20.
I think it fits your experience perfectly, and they sound Awesome!

The only problem is the bell. It's tiny.

The Hi-hats are simply amazing and are very strong and versatile.
The medium thins have a dark/deep tone and are very warm sounding.
They are very thick and sturdy cymbals and pack a punch when played.
The ride has an incredible sound too. Very pingy.

The splash has a very sharp sound and cuts very well.
It's sustain is short, allowing for bigger fills and more cymbal action.
The Xs20's are a full line. Including chinas. But thats my opinion. Get what you think is best. Remember, whatever sounds better to you, will be the better choice.
Cheers, and happy drumming!
