GBA (Not SP) Aftermarket Buttons

[Jedi Master Baiter]

So I bought a GBA mod (IPS Screen, Speakers, Battery) and everything is awesome

...except the buttons. They are aftermarket, and it feels like there's extra distance to register a press. The d-pad is very noticeable: I'll tap a direction and nothing will happen, but if I push harder, I'll feel a hard 'click' and that's annoying to have to do.

Is this caused by the buttons or the membrane? Any aftermarket recommendations? Should I just find OEM buttons? OEM membranes? Both?

Edit: I'm used to the GBA SP buttons. I've read that original GBA buttons are 'mushy' compared to the 'clicky' SP. The problem is... these don't feel mushy. They feel clicky, but with more distance to travel to fully depress, and there's two clicks: first a soft click that doesn't register anything, and a second hard click that will actually register a press.