AAAACK!!! Your first step needs to be to take those Yamahas out in the backyard and douse 'em with gas, then toss a match on them! Yamaha monitors are NOTORIOUS for being ear-fatigue monsters, plus they're not all that accurate. Studios DO use them...but they use them as "checks", not for the critical-listening functions. They're not at all neutral. Plus, since you only have a 5" woofer here, you're not hearing all of your low end, as it can't be accurately reproduced. Personally, I'm very much part of the "He-Man NS-10M Haters" club, and the HS5s are just an outgrowth of those.
I'm going to suggest spending some money here, but it's 100% worthwhile. First up, don't look at ANYTHING with a woofer smaller than 8". Electronic music can do massive bass...but if you can't hear what you're doing in that range, it's pointless. Second, you want biamplification and POWER; it might seem silly to have 100 watts of amplification sitting 4 feet in front of you, but you won't use all of those 100 watts. Instead, you want headroom...ample wattage so that, if there's a BIG transient, it can be reproduced accurately in the few milliseconds that the amps have to hit hard. Lastly, find a pro audio dealer, and take some time to audition monitors. If this requires travel, screw it and do it anyway. The monitors are your window on what you're doing, and if THEY suck, your own work will suck!
Now, holding a line at $600 apiece, here's some suggestions. I'm familiar with these to varying extents, and they should be more than adequate for your uses.
Focal Alpha 80
Presonus Eris E8XT or Scepter S8 (single-point source, like the older Tannoys!)
Adam T8V
KRK Rokit G8 or Rokit 10-3 G4 (this is a 3-way system, 10" woofer!)
Tannoy Gold 8
Use the Pioneers as your "checks", since they're weighted more for DJ work, which I'll bet is where you're aiming your music. But get those Yammys outta there. Yamaha makes some nice stuff...but their monitors ARE NOT part of that!