PHX,
Mike has some words of wisdom there.
Its no great hassle to add the diodes now and they are cheap.
If you wanted to go back later and add them I reckon it would be a hassle.
I wired up my BU0836's as per your second sketch but with the diodes in there. Just make sure you have them all in the same
orientation as per Leos sketch as they only let the current
flow in one direction.
But again, Mike is right, either of your setups should work like a champ.
You might already know this but the easiest way (IMHO) to hook up to leo's board is to grab an old Floppy Cable and hack one end off it. The connector fits over the pins on Leos board nicely. You will however have some spare wires as the floppy
connector has 2 or 4 (cant remember) more sockets than there are pins on the board.
Here is a Leo's sketch modified a little. (I added a status LED)
As well as how I put the diodes on the switches in my setup.
Have fun. Its very cool when you get it going.