Here are the options I am thinking of...

iPod Touch on a SM Pro Audio DI Dock
iPod Touch on a Tascam CD200i
iPad 2 in an Alesis iO Dock running the Live Trax Pro App
Yamaha Tyros 4
Korg PA3x (Using mp3 for audio)

Replace my Motif ES with my Motif XF for gigs...
Use my files with the audio player on the XF (Organize on the computer in folders)

The Tyros will give me great additional sounds to use live and the VH2. Plus, I sell the Clavinova line and the Tyros would be a great way to demo sounds of the higher end Clavinovas.

On the Tyros 4... Can I organize WAV files into different folders on the HD?