Congrats Scott, it seems you made the "right"decision, since you know how Yamaha keyboards work and the transition will be rather easy for you.
Regarding your choice, so what, you have all the time in the world to check out the new korg wherever it comes out, and if it is superb and fit your needs, i suspect you will have no problem switching brands. it is a win win situation for you.