That's easy -
Yamaha 9000pro as the main controller, and a Roland VA (whatever)as a second sound source and smf player. Best sound combo I can think of, with the most versitility and easiest controller options. It also give the on-board monitoring I love so much, and a great vocal processor with harmony.
(Plug the 9k into the VA audio in's)
This will only use a stereo pair of inputs on your mixer/amp too. Compact, laoded with power and all the sounds you'll ever need.
The Yamaha has the modeled organs, and wonderful EP's, and the Roland GS2 acoustic piano is a dream.
So - keep your VA7, and sell the PA80 to get a 9kpro - I hear the price just dropped a bit - you'll probably do pretty well on a swap-out. Good luck, Frank !