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?