Chris
No use worrying about elec these days. There's only one way it's going.
You seem to say you are a pianist first. That's great. So was I.
If you do upgrade or add, The pa900 or pa3x will still keep that going. Both have some beaut pianos and excellent drum kits.
Also a lot is available.
I'd suggest a yammie but a bit pricey.
Don't think you can get the T5 yet but it will be 5grand plus.
baz