I think it will be Yamaha.
I play a lot of jazz piano. The tone of the Kawai is fine, but I didn't like it much for the type of music I play. I spent a good half hour in the store playing each piano. The Yamaha is bright, but not in a brittle way. It's very clear, actually, and doesn't have any of the harshness people sometimes speak of. The Kawai, however, had the attack so far buried in the resonance, that I found it difficult to make the piano speak clearly in some passages. Perhaps a little voicing could help this, but all the same I prefer the Yamaha.
Thanks for all your insights.
cheers
Doug