Octo for me, especially with SNK games. Feels like if you've had an opportunity to use both, octogonal and square fit for different games. Street Fighter might work better as a square for me because of the number of charge moves/characters, for instance.