Yeah the XDJ-RX would be awesome. It's also been out for a year (and B&H says it is "discontinued") so maybe there's a good price to be had for a drop.
XDJ-RX translates much better to what you will actually find in a club. +1 for that. Carrying your giant controller around is no fun but practicing on an XDJ-RX at home and then being able to just bring a USB drive to the club and feel at home is ideal.