Swapping keycaps such as Z and Y within the current set wont work well as the rows have different profiles. If you can find the appropriate keycaps from a broken Amiga keyboard for example you can use them with the appropriate keymap selected. Hopefully
http://www.a1200.net/ will run a successful kickstarter for new keycaps soon.
