Kris,
I think you may be able to solve your keyboard collision problem by going into the 'mixing console' and transposing the entire keyboard (Main, Layer, & LEFT) up/down an octave. Then you can go back and reset the 'upper octave' transposition (Main & Layer parts) as needed. This seemed to solve it for me. Hope it works for you.
- Scott