Cool, I did notice that you were setting up more of a custom rig. That being the case are you seeking all new hardware too. Everything is gonna go on the rack.
So your keeping cymbals too. If you already have the hardware inc hat stands and pedals etc then it all comes down to how much you would like to spend. If you can give a $$$ value I would love to present some feasible suggestions for you.
Again not that I am saying buy this kit, the one I linked to, but shipping on that to Au is $200 US
I also at one stage had exactly your model and color
pearl and thought it was a great kit, took heaps of abuse...