Breezer,
Sorry I did not come back to you yesterday. As requested, here is exactly the way the two switches are currently wired:
Lighting ring (main power) is wired to two gang switch A; red to one way terminal, black to two way terminal. Switch cable red to common terminal, blue to two...