Star Trek uses 4 buttons: fire, thrust, photon torpedoes, and warp.
I would put "up" the same direction on all four sticks.
I'm sure the diamond or the square pattern will both work fine. In fact, very few games need the fourth button. NBA Jam and other three-button games would probably work better if the buttons were laid out in a row.