This is the first time I've been diagram ninja'd! Well done, Wheybags!
Here's mine:

- Matrix Guess.jpg (862.4 KiB) Viewed 2028 times
Functionally the same as Wheybags. Just make sure there's continuity in the half destroyed traces you rely on. Obviously A and B are the switch pins while X and Y are the diode's.
Edit: I'm wrong: B connects to Y but not to the horizontal line. That vertical trace is just there to hook the switch and diode up in series, and does not join anything else. Looks like it should be like this:

- Matrix Guess 2.jpg (875.27 KiB) Viewed 2019 times
Watch out for both those horizontal rails. They need to conduct signals from other switches, while not shorting with the right hand pin of the diode.