Disclaimer: i don't own one yet

The changes seem very reasonable. Caps Lock isn't usually needed (except by trolls) and this brings the keyboard very close to a real keyboard. The only problem is that the shift label is on another key, but I would accept that.

Is there a way to switch the keys or is the keymat one part?

Edit: mp107's solution two posts below seems to be better to me.