Keyboard layout wrong

OK I got a new MBP 17inch and **** its great, but the keyboard layout is wrong. Its a japanese mac and so has a japanese keyboard, I am able to use the japanese alphabet correctly but when I switch to romanji (Roman script) I get the american layout which is annoying. Any ideas?

Also what the best software for coling this bad boy?

Call up the International preferance pane, then click on Input Menu.

Untick the U.S. keyboard, and tick the one you want. If you tick "Show input menu in menu bar" at the bottom, you can flip back and forth with a single click.

It doesnt work, I have access to the other imput methods but the kyboard still isnt right. I have to press shift 2 for the at symbol instead of the standard Japanese one button. I will pop to the mac shop on sunday.