Hi,
I would go for the last option, the SW1000XG
card is a great tool. An SB16 would happily co-exist with the Yamaha card, so you can keep what you already have.
And, there aren't any PCI cards with wavetable connectors.(I think!)

Go for it...

alvinc