Yamaha DTXpress/DTXplorer/DTXtreme

hi, 

i'm using DTXpress II and recording on ProTools/Mac.

i want a wider, better selection of drum sets and sounds to choose from than 
i've got in the DTXpress II brain.

i have SampleTank Le and it has 2 or 3 drum kits but the midi notes are 
assigned DIFFERENT  than the DTXpress.

is there a Yamaha SOFTSYNTH / SOFT-DRUM MACHINE that would work  
OUT OF THE BOX with proper midi note assignments and great sounds?

any smart suggestions would be helpful,

thx