upgrading 2 gang switch - 1 x 1 way 1 x 2 way.

[notts1966]

I'm struggling to complete what - on the face of it - should be a straightforward switch upgrade.

Situation.

Current - and old - two gang switch operates a light in kitchen (2 way switching) and one in the dining room (one way switching).
The kitchen light is a 2-way switch, with a further single switch by back door. I have replaced this switch with a new one and all works fine.

Wiring coming into the current 2 gang switch is as follows;
1 x two core (red and black) wiring
1 x three core (red/blue/yellow) wiring
1 separate - and single - black wire.

In the current switch the terminal markings are;

(Across the top) A (com) B (1 way) B (2 way)
(Across the bottom) A (1 way) A (2 way) and B(com).

The wires are connected as follows;

Top - A (com) - yellow B (1 way) - the single black B - (2 way) - empty

Bottom - A (1 way) - black (from black/red) A (2 way) - red (from red/black) and B (com) - red (from r/y/b)

There is a link - red wire - between A (2 way) and B (com) on the bottom row.

Hopefully that has painted a reasonably clear picture of the current situation.

I am looking to replace the switch with a new one which has the following terminals in two distinct blocks;
Block 1 - top - common, bottom L1 and L2
Block 2 - top - common, bottom L1 and L2.

Thanks in anticipation of an electrical 'wizard' coming to my aid to solve the problem!