Even if the keycaps moved, symbols are not always shared on the same keys between qwerty and azerty (man that's hard to type!). I think the replacement keyboard will be the better option.

We've changed a lot of thinkpad keyboards (I hate that they paint the letters on rather than inlay ). It's fairly straightforward surgery: four or five screws on the back, the keyboard lifts out and the new one goes in.

-jk