You can't go wrong with the XP30 then. I have one as well. You get around 1,400 sounds out of the box, the Session, Orchestral and Techno boards built in as well as room for 2 more SR-JV cards.
Newer synths like the RS-5/9 have the better sounds from the XV series synths but lack aftertouch key response and have no sound expansion/upgrade capabilities.