Now that I have all my pieces cut and temporarily fixed together (thank you masking tape) I need to return my attention to my wiring. The flying leads I used when first putting the keypad together are far too long and are made from single core wire making them very stiff and prone to breaking at the soldering point if bent too often. After carefully removing the old wiring (scary even though I know I’m putting it back together again) I replaced it with a length of ribbon cable and some more flexible multi core wires (see before and after images below).

Much neater It makes such a difference when fitting it to the case as well:

Now that I’ve finished my alterations I can show you how it is going to work (please excuse the hiccup, my PIC must have been having a bad day…):