Update on my progress on this.
I have built some switch hardware to suit the 3.1.3.x firmware using illuminated push button switches. It consists of one board with all the smarts that plugs into another board that has the switches soldered into it. Theres one switch board design for 1, 2 or 3 ...