For your styles mentioned, I'd consider the following pirced from cheapest to most expensive:
Yamaha DJX
Yamaha CSX 6
Yamaha PSR 2000
Yamaha S90
Yamaha Motif
The Motif ES is coming out in October. If you need a workstation, this would be a great option and your most expensive option.
Don't let some sales person wow you in a store. They will purposely set up specific keyboards to sound great. Usually the ones they need to unload. Listen for yourself. My friend just got duped into buying a Roland Fantom S because of this tactic.