Since you prefer the Yamaha sounds..get the PSR3000,,,I think most of the sounds , other than the acoustic piano will sound close to the Motif..
And since you like the drums on the Motif[over the Midjay]...you will like the drums on the PSR3000..[you will get use to the hand clap instead of a snare drum]...