At this stage in the game...I personally would wait a few months and see what ACTUALLY is released from Yamaha & Roland instead of trying to guess what the future will bring before I spent $3000.00 on a KB. No one yet knows what is in the cards......but dont let your impatience leave you depressed when they release something your left saying to yourself...
"I Should Have Waited'

Good luck with you choice.