Thanks for the wiring diagram John. It's easy to see why the 2 plugs when put on the newer switch smokes since the F-1 and F-2 red & green don't align with the right terminal. You can use either switch and single or even the double plugs as long as you switch the wires to align with proper terminal.

A-brown (might have stripe) B-pink P-blue F-2 green F-1 red W- brown V10-18br