The Motif XS will fill your needs for the modern music. I think it will also please you in the traditional styles as well, as Yammie is now putting so much emphasis on acoustic emulation.

If you can I'd keep the T2. As nice as the XS is I think you'd miss the full arranger functions of the T2. The XS is going to satisfy you as well by having expanded versions of the SA voices. Plus it will have other Yamaha signature voices found on the arranger line.

Squeak