Can we PLEASE have a way to have spot/ping keybind separate from gadget.

So often, I'll go to ping an spot and enemy I'm looking at and I'll end up bringing out a gadget instead. 

It's so incredibly infuriating. Even when I try to use the button to thank someone for rez'ing me, it'll switch to a gadget. 

It's the most frustrating thing. PLEASE.