Well my struggles were largely with shift/control to melee/shoot. I'm not sure exactly where I think they would be better, maybe on Q or E? Or maybe just moving one button to Q or E or something so they weren't both controlled by my pinkey. 

Alternately if there were a way to use both hands on my keyboard it might feel more like an actual arcade machine, like using J K L for the three buttons. If you were to do that though you might have to change how you actually repair the buttons, but it would free up the spacebar, so maybe you could use that? Or maybe you just have to switch back to the mouse, although that could be tough. Might be worth a try if it's easy to swap the controls around.