Yes.I should place the single wire (that is currently in Variable) in the Common terminal and the two remaining wires (that are currently in L2) in the L1 terminal of the new single switch?
With the two-way switch being used as only a one-way it doesn't actually matter which way round.
Apologies again for confusing you.