well, using up to jump in a 2D game is normally a bad idea, I'd suggest A=jump, B=punch, X=kick, Y=block but maybe it would be a better idea to put the attacks next to each other like the first option you made