Hey man,
I happen to be in the process of building the a street fighter 2 CE cab too. I ran across the same problem with the control panel, I want to use the Japanese style layout but the graphics are laid out for the traditional SF2. I cannot offer any advice on Photoshop but I can tell you that the player 1 and player 2 button need to be much closer. Anyways it looks good.