Drop in tuning machines for 2023 JMJM/ Momentary kill button

Has anyone replaced their tuning machines on their J Mascis JM with something they like? It’s my only gripe about this amazing thing so far. Are these tuners vintage replicas because I officially don’t care for indented tuning keys? I’m looking for regular tuners like I have on all my other guitars. Just regular no locking but no drilling either. Drop in replacements even fender.

I’m also looking for a kill switch button that would replace the slider for the rythym circuit without modding the pickguard so much and staying discreet. Ha! Does anyone sell square momentary kill switches?