Photoshop CS6 issue with shortcuts and my keyboard after upgrade from CS5

I recently upgraded from CS5 Extended to CS6 Extended on my Mac (Mavericks), but installed it in English instead of German this time. I transferred most of my presets just fine, but none of the keyboard shortcuts were working. All I got was an unequal sign for all shortcuts and even manually changing them didn't get them to work. I found a few discussions about this issue and ended up adding a German keyboard, as I am always on the Romaji setting of my Kotoeri (Japanese) keyboard. That seemed to solve the issue, but only if I change to the German keyboard before opening Photoshop. Shortcuts don't work in CS5 anymore either unless I do. Sometimes the shortcuts also stop working a while after I change back to the Kotoeri keyboard.

Now I would like to know if there is any way to get around this issue. Isn't there a way to get my shortcuts working again without constantly having to change keyboards? I much prefer the Kotoeri one since the icon for the German keyboard in my menu bar looks extremely obnoxious, in my opinion. It's mostly a cosmetic thing to me, but I would love to get everything back to the way it was before.

I'd much appreciate any advice or help.