My suggestion to you (which will probably irk a few people here).., is to stay away from both Roland and Yamaha for this, and IF you HAD to choose between the Roland and Yamaha for these styles, I'd suggest the Roland.
The type of music you're wanting to play/record (which I'm sure you know) is an ever changing category of music. Typically for these styles of music you really (IMO) should look towards a synth/workstation because they have sequencers, patch editing, and other features that are tailored specifically for those styles.
However.., if you prefer the arranger for this.., I would strongly suggest you look at the Korg line up. Korg IMO does a much better job at combining both a fully editable synth engine with an arranger. Plus (although it's subjective), Korg, IMO has a sound set more adequate for these styles too.
I play and write the same styles of music, but I won't use my arranger for it (currently Yamaha PSR-S700). For these styles I use my Roland Juno-Di. My Di's an excellent example of how even inexpensive performance synths differ in comparison with arrangers for these styles. My $700 Di has a set of kits for electronica that surpass the S-950 (especially due to the ability to actually tweak each individual part of the drum kit with the software editor.
I then use my computer with a DAW for sequencing.
Sqk
_________________________
GEAR: Yamaha MOXF-6, Casio MZX-500, Roland Juno-Di, M-Audio Venom, Roland RS-70, Yamaha PSR S700, M-Audio Axiom Pro-61 (Midi Controller). SOFTWARE: Mixcraft-7, PowerTracks Pro Audio 2013, Beat Thang Virtual, Dimension Le.