Tim,
The way I view the situation, is that you actually chosen the S900 to be your next arranger. Of course you haven't chosen defective product martyrdom in the process.

I suggest you to personally pull some hair at Yamaha, via telephone and also in writing, so:
1) You get exactly what you are paying for.
2) They realise something is terribly wrong, in the production line/supply chain.

To change the keyboard brand to some other, won't solve the problem, especially your problem. You will not get what you wanted.

As far as gifts from Yamaha, I think that you are not the person to take advantage from the situation to get a free copy of anything.

Congratulations for your patience.