Adam,
What he wants is when in state 1 the two switcheson the left control the lamps, and when in state 2 the two switches on the right control them. As is, if both switches are on on either side, the lamps cannot be controlled independently.
IMHO, diodes in series with each switch is a fine...