What you've got are plate mount switches which they are calling 3 pin and PCB mount switches which they are calling 5 pin.
The extra pins in this case are the plastic legs that some PCB's will have holes for.
The white body switches as far as I know are the same just that the white body might work better with certain kinds of backlighting.
I am not familiar with the kinesis advantage to know if it supports PCB mounted switches but if it has a plate you can get away using the 3 pin switches.
Those gaterons will not have diodes in them.
Where are you located for shipping? I can send you a couple gateron white switches for the cost of shipping if you want to try one out, assuming you haven't already.