Go tap and play...
Look for what characteristics you want.
If you want a lot of cymbal spread in a ride then go for a crash/ride
If you want cymbals that respond very quickly then get medium-thin to thin cymbals.
On the hats... experiment with sizes and combinations.
You say you have B8 already.
What you can do is get a new set of hi-hats and combine the two.
Maybe what you are looking for will be two B8 tops to make one combination and then use both B8 bottoms on another hi-hat stand. You could set up one with this
Buy Gibraltar Auxilairy Hi-Hat Arm With Clamp online at Musician's Friend which will hold it in a specific setting.
All I am saying is look at what you have, and where you want to go, and decide if you want to modify your current, or integrate it, or just go new all together.
My personal favorite is the Wuhan S brand. It isn't everyone's cup of tea... but I love the sound of them.