Re: cymbals - this is an age-old discussion, and if I may cut to the chase, I suggest you "buy once, cry once", meaning you bought the best cymbals you could find, and are crying because you've overspent. The reality with cymbals is this: you can't make them sound better. They must need to be purchased sounding great. So if you were to go through your music collection and did some digging to find out what your favorite players played, it will most likely have been all upper end Zildjian, Paiste, or Sabian. Meinl and others make high-end cymbals too, and those are just as expensive. But if you save your pennies and go this route, you will have the cymbals you could probably take to your grave. I have Zildjians in my collection from 30 years ago now and they still sound great, and they're what people are used to hearing since you hear them on every hit song for the last 60 years.
So if you could save more pennies and go searching for used Zildjian A's, or used Sabian AA's, or used Paiste 2002's (most expensive on the used market), you will have covered what you need in the cymbal department for every genre and every playing situation you may encounter for the rest of your life. Drums are easy - change heads and you can make them sound better. Cymbals are the opposite - if it's and now, it'll be bad later. You can't change that except for avoiding bad ones to begin with. If you're in this for the long haul, just get good ones to start with - even if this is just a hobby.